diff --git a/src/power.sh b/src/power.sh
index e198610..0ece9bc 100644
--- a/src/power.sh
+++ b/src/power.sh
@@ -81,12 +81,11 @@ finish() {
     done
   fi
 
-  if [ ! -f "$STORAGE/windows.boot" ] && [ -f "$STORAGE/$BASE" ]; then
+  if [ ! -f "$STORAGE/windows.boot" ] && [ -f "$BOOT" ]; then
     # Remove CD-ROM ISO after install
-    if ready; then
-      if rm -f "$STORAGE/$BASE" 2>/dev/null; then
-        touch "$STORAGE/windows.boot"
-      fi
+    if ready && [[ "$REMOVE" != [Nn]* ]]; then
+      rm -f "$BOOT" 2>/dev/null || true
+      touch "$STORAGE/windows.boot"
     fi
   fi