diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 914f5ff..0b3d2fc 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1226,7 +1226,8 @@ make this the default behavior.)"
 			  "\\[\\[.*?\\]\\[\\(.*?\\)\\]\\]" "\\1"
 			  (match-string 4)))
 			(t "???")))
-	    (setq org-clock-heading (org-propertize org-clock-heading
+            (setq org-clock-heading 
+                  (org-propertize org-clock-heading
 						    'face nil))
 	    (org-clock-find-position org-clock-in-resume)
 	    (cond
@@ -1241,7 +1242,10 @@ make this the default behavior.)"
 	      (setq org-clock-start-time
 		    (apply 'encode-time
 			   (org-parse-time-string (match-string 1))))
-	      (setq org-clock-effort (get-text-property (point) 'org-effort))
+              (setq org-clock-effort 
+                    (save-excursion
+                      (org-back-to-heading t)
+                      (get-text-property (point) 'org-effort)))
 	      (setq org-clock-total-time (org-clock-sum-current-item
 					  (org-clock-get-sum-start))))
 	     ((eq org-clock-in-resume 'auto-restart)
@@ -1261,7 +1265,10 @@ make this the default behavior.)"
 		(beginning-of-line 1)
 		(org-indent-line-to (- (org-get-indentation) 2)))
 	      (insert org-clock-string " ")
-	      (setq org-clock-effort (get-text-property (point) 'org-effort))
+              (setq org-clock-effort 
+                    (save-excursion
+                      (org-back-to-heading t)
+                      (get-text-property (point) 'org-effort)))
 	      (setq org-clock-total-time (org-clock-sum-current-item
 					  (org-clock-get-sum-start)))
 	      (setq org-clock-start-time