diff --git a/etc/bootloader/grub b/etc/bootloader/grub
index 44e565b..2ed2016 100644
--- a/etc/bootloader/grub
+++ b/etc/bootloader/grub
@@ -7,7 +7,7 @@ packages() {
 }
 
 config() {
-	if [ "${ENC}" == "1" ]; then
+	if [ "${ENC}" == "1" ] && ! [ "${ENCRYPTION_STYLE}" == "e" ]; then
 		if ! grep -q "GRUB_ENABLE_CRYPTODISK" /etc/default/grub; then
 		echo "GRUB_ENABLE_CRYPTODISK=y" >> /etc/default/grub
 		fi
diff --git a/main.sh b/main.sh
index 56f45c5..64efac1 100755
--- a/main.sh
+++ b/main.sh
@@ -115,7 +115,7 @@ do_partition() {
 		parted "${TARGET_PHY_ID}" unit mib -s -- mkpart EFI fat32 "$start" "$end"
 		parted "${TARGET_PHY_ID}" unit mib -s -- set 1 esp on
 		TARGET_PART="2"
-		start="$(( end + 1 ))"
+		start="$(( end ))"
 		sleep 2
 		mkfs.vfat -I -F32 "${TARGET_PHY_ID}-part1"
 		if [ "${ENCRYPTION_STYLE}" == "e" ]; then
@@ -123,7 +123,7 @@ do_partition() {
 			end=$(( start + size ))
 			parted "${TARGET_PHY_ID}" unit mib -s -- mkpart boot ext4 "$start" "${end}"
 			TARGET_PART="3"
-			start="$(( end + 1 ))"
+			start="$(( end ))"
 			BOOTDEV="${TARGET_PHY_ID}-part2"
 			sleep 2
 			mkfs.btrfs -q -f "${TARGET_PHY_ID}-part2"
@@ -137,7 +137,7 @@ do_partition() {
 			size=2048
 			end=$(( start + size ))
 			parted "${TARGET_PHY_ID}" unit mib -s -- mkpart primary ext4 "${start}" "${end}"
-			start="$(( end + 1 ))"
+			start="$(( end ))"
 			TARGET_PART="2"
 			BOOTDEV="${TARGET_PHY_ID}-part1"
 			sleep 2