diff --git a/src/dosinst.c b/src/dosinst.c
index a54d168..0c16173 100644
--- a/src/dosinst.c
+++ b/src/dosinst.c
@@ -361,7 +361,9 @@
 {
     int		i;
 
-    mch_chdir(sysdrive);	/* avoid looking in the "installdir" */
+    /* avoid looking in the "installdir" by chdir to system root */
+    mch_chdir(sysdrive);
+    mch_chdir("\\");
 
     for (i = 1; i < TARGET_COUNT; ++i)
     {
@@ -376,7 +378,10 @@
 	    remove_tail(default_bat_dir);
 	}
 	if (check_bat_only && targets[i].oldbat != NULL)
+	{
 	    free(targets[i].oldbat);
+	    targets[i].oldbat = NULL;
+	}
     }
 
     mch_chdir(installdir);