 		      (['rex ['ok modified]]
 		       (progn
 			 (preview-commit-cancel current-file-name modified nil)
-			 (with-current-buffer (get-file-buffer current-file-name)
+			 (with-current-buffer (get-file-buffer-1 current-file-name)
 			   (goto-line line-no)
 			   (goto-column column-no)))))))
 	     (message "Refactoring aborted!")))
 	   (['rex ['ok modified]]
 	    (progn
 	      (preview-commit-cancel current-file-name modified nil)
-	      (with-current-buffer (get-file-buffer current-file-name)
+	      (with-current-buffer (get-file-buffer-1 current-file-name)
 		(goto-line line-no)
 		(goto-column column-no))))
 	   )))

	       (['rex ['ok modified]]
		(progn	   
		  (preview-commit-cancel current-file-name modified nil)
		  (with-current-buffer (get-file-buffer current-file-name)
		    (goto-line line-no)
		    (goto-column column-no))))
	         (['rex ['ok candidates logmsg]]

		      (if (equal modified nil)
			  (message "Refactoring finished, and no file has been changed.")
			(preview-commit-cancel current-file-name modified nil))
		      (with-current-buffer (get-file-buffer-1 current-file-name)
			(goto-line line-no)
			(goto-column column-no))))
		   )))
