diff --git a/lisp/org.el b/lisp/org.el
index 59caf41..06b9f9e 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -7501,7 +7501,7 @@ If yes, remember the marker and the distance to BEG."
       (narrow-to-region
        (progn (org-back-to-heading t) (point))
        (progn (org-end-of-subtree t t)
-	      (if (org-on-heading-p) (backward-char 1))
+	      (if (and (org-on-heading-p) (org-at-regexp-p "*")) (backward-char 1))
 	      (point))))))
 
 (eval-when-compile