diff --git a/0-preinstall.sh b/0-preinstall.sh
index 82b0329..c5dcb95 100755
--- a/0-preinstall.sh
+++ b/0-preinstall.sh
@@ -47,20 +47,22 @@ do_format() {
 }
 
 do_lvm() {
+    i=1
     while [[ "$i" -le "$LVM_PART_NUM" ]]; do
         if [[ "$i" -eq "$LVM_PART_NUM" ]]; then
             lvcreate -l 100%FREE "$LVM_VG" -n "${LVM_NAMES[$i]}"
-            do_format /dev/"$LVM_VG"/"${LVM_NAMES[$i]}"
         else
             lvcreate -L "${LVM_SIZES[$i]}" "$LVM_VG" -n "${LVM_NAMES[$i]}"
-            do_format /dev/"$LVM_VG"/"${LVM_NAMES[$i]}"
         fi
         i=$((i + 1))
     done
 }
 
 lvm_mount() {
-    mount /dev/"$LVM_VG"/"${LVM_NAMES[0]}" "$MOUNTPOINT"/
+    vgchange -ay &>/dev/null
+    lvchange -ay /dev/"$LVM_VG"/"${LVM_NAMES[$i]}" &>/dev/null
+    do_format /dev/"$LVM_VG"/"${LVM_NAMES[$i]}"
+    mount /dev/"$LVM_VG"/"${LVM_NAMES[0]}" "$MOUNTPOINT"
     for x in "${LVM_NAMES[@]:1}"; do
         mkdir "$MOUNTPOINT"/"$x"
         mount /dev/"$LVM_VG"/"$x" "$MOUNTPOINT"/"$x"
diff --git a/startup.sh b/startup.sh
index 30536f0..616c8de 100644
--- a/startup.sh
+++ b/startup.sh
@@ -301,6 +301,7 @@ set_partion_layout() {
                 ;;
             *)
                 invalid_option
+                set_partion_layout
                 break
                 ;;
             esac
@@ -322,6 +323,7 @@ set_filesystem() {
             break
         else
             invalid_option
+            set_filesystem
             break
         fi
     done
@@ -360,6 +362,7 @@ set_timezone() {
                 break
             else
                 invalid_option
+                set_timezone
                 break
             fi
         done
@@ -383,6 +386,7 @@ set_keymap() {
             break
         else
             invalid_option
+            set_keymap
             break
         fi
     done
@@ -422,6 +426,7 @@ disk_selection() {
             break
         else
             invalid_option
+            disk_selection
             break
         fi
     done
@@ -453,6 +458,7 @@ set_locale() {
             break
         else
             invalid_option
+            set_locale
             break
         fi
     done
@@ -524,6 +530,7 @@ set_desktop() {
             esac
         else
             invalid_option
+            set_desktop
             break
         fi
     done
@@ -585,11 +592,13 @@ make_choice() {
                 ;;
             *)
                 invalid_option
+                make_choice
                 break
                 ;;
             esac
         else
             invalid_option
+            make_choice
             break
         fi
     done