diff --git a/phpinspect-buffer.el b/phpinspect-buffer.el
index f16cecd..64e5e17 100644
--- a/phpinspect-buffer.el
+++ b/phpinspect-buffer.el
@@ -73,7 +73,9 @@ linked with."
 
 
 (cl-defmethod phpinspect-buffer-reparse ((buffer phpinspect-buffer))
+  (setf (phpinspect-buffer-tree buffer) nil)
   (setf (phpinspect-buffer-map buffer) (phpinspect-make-bmap))
+  (phpinspect-edtrack-clear (phpinspect-buffer-edit-tracker buffer))
   (phpinspect-buffer-parse buffer))
 
 (defsubst phpinspect-buffer-parse-map (buffer)