       (goto-char (point-min))
       (while (not (eobp))
         (setq consider-this-line nil)
-        (dolist (ov (overlays-in (line-beginning-position) (line-end-position)))
+        (dolist (ov (overlays-in (svn-point-at-bol) (line-end-position)))
           (when (overlay-get ov 'svn-blame-line-info)
             (when (string= reference-value (funcall compare-func ov))
               (setq consider-this-line t))))
         (when consider-this-line
-          (dolist (ov (overlays-in (line-beginning-position) (line-end-position)))
+          (dolist (ov (overlays-in (svn-point-at-bol) (line-end-position)))
             (when (and (overlay-get ov 'svn-blame-highlighted) is-highlighted)
               (delete-overlay ov))
             (unless is-highlighted
-              (setq hl-ov (make-overlay (line-beginning-position) (line-end-position)))
+              (setq hl-ov (make-overlay (svn-point-at-bol) (line-end-position)))
               (overlay-put hl-ov 'svn-blame-highlighted t)
               (overlay-put hl-ov 'face 'svn-status-blame-highlight-face))))
         (forward-line)))))

    '((t :inherit highlight))
    "Default face for highlighting a line in svn status blame mode."
    :group 'psvn-faces))

(defvar svn-highlight t)
;; stolen from PCL-CVS

        (is-highlighted)
        (consider-this-line)
        (hl-ov))
    (dolist (ov (overlays-in (svn-point-at-bol) (line-end-position)))
      (when (overlay-get ov 'svn-blame-line-info)
        (setq reference-value (funcall compare-func ov)))
      (when (overlay-get ov 'svn-blame-highlighted)
