diff --git a/calfw-org.el b/calfw-org.el
index 4590f1c..f098a76 100644
--- a/calfw-org.el
+++ b/calfw-org.el
@@ -238,14 +238,13 @@ If TEXT does not have a range, return nil."
 				(match-string 1 extra)))
 		      (total-days (string-to-number
 				   (match-string 2 extra)))
-		      (start-date (time-subtract
-				   (org-read-date nil t date-string)
-				   (seconds-to-time (* 3600 24 (- cur-day 1)))))
+		      (start-date (org-read-date nil t date-string))
 		      (end-date (time-add
-				 (org-read-date nil t date-string)
-				 (seconds-to-time (* 3600 24 (- total-days cur-day))))))
-		 (list (calendar-gregorian-from-absolute (time-to-days start-date))
-		       (calendar-gregorian-from-absolute (time-to-days end-date)) text))
+				 start-date
+				 (seconds-to-time (* 3600 24 (- total-days 1))))))
+		       (unless (= cur-day total-days)
+             (list (calendar-gregorian-from-absolute (time-to-days start-date))
+		                  (calendar-gregorian-from-absolute (time-to-days end-date)) text)))
 	     )))))
 
 (defun cfw:org-schedule-period-to-calendar (begin end)