diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 0d76b3b..0681153 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -197,11 +197,9 @@
 	// restore to empty when write failed
 	if (empty_bufname)
 	{
-	    // prevent double free
-	    if (buf->b_sfname != buf->b_ffname)
-		VIM_CLEAR(buf->b_sfname);
 	    buf->b_fname = NULL;
 	    VIM_CLEAR(buf->b_ffname);
+	    VIM_CLEAR(buf->b_sfname);
 	    unchanged(buf, TRUE, FALSE);
 	}
     }
diff --git a/src/version.c b/src/version.c
index ea41816..b9fdfcd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    653,
+/**/
     652,
 /**/
     651,