diff --git a/code/Calendar.php b/code/Calendar.php
index d67a97d..b8eebc5 100755
--- a/code/Calendar.php
+++ b/code/Calendar.php
@@ -501,9 +501,9 @@ public function setWeekendView() {
 
 
 	public function setMonthView() {
-		$this->view = "month";
+		$this->view = "month";		
 		$this->startDate = sfDate::getInstance()->firstDayOfMonth();
-		$this->endDate = sfDate::getInstance()->finalDayOfMonth();
+		$this->endDate = sfDate::getInstance($this->startDate)->finalDayOfMonth();
 	}