diff --git a/Amelia.sh b/Amelia.sh
index bdadb95..58b5520 100644
--- a/Amelia.sh
+++ b/Amelia.sh
@@ -3538,7 +3538,13 @@ ${multi_swap}
                 	until manual_part; do : ; done
                 else
                 	process
-                	until auto_part; do : ; done
+                	if [[ "${slct_autoprt}" != "yes" ]]; then
+                	    until auto_part; do : ; done
+                	    return 1
+                	else
+                	    until manual_part; do : ; done
+                	    return 1
+                	fi
                 fi
         	elif [[ "${multibooting}" == "y" ]]; then
                 process
@@ -6235,6 +6241,7 @@ OPTIMIZED_CONF
 		hypervisor=""
 		mkinitcpio_mods=""
 		ukify=""
+		slct_autoprt=""
 
         clear
         first_check