diff --git a/lisp/org.el b/lisp/org.el
index 1d83aa4ae..0c25fa28a 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5338,8 +5338,8 @@ the rounding returns a past time."
 	    (apply 'encode-time
 		   (append (list 0 (* r (floor (+ .5 (/ (float (nth 1 time)) r)))))
 			   (nthcdr 2 time))))
-      (if (and past (< (time-to-seconds (time-subtract (current-time) res)) 0))
-	  (seconds-to-time (- (time-to-seconds res) (* r 60)))
+      (if (and past (< (float-time (time-subtract (current-time) res)) 0))
+	  (float-time (- (time-to-seconds res) (* r 60)))
 	res))))
 
 (defun org-today ()