diff --git a/setup_usb_final.sh b/setup_usb_final.sh
index 5cfd988..9647592 100644
--- a/setup_usb_final.sh
+++ b/setup_usb_final.sh
@@ -50,10 +50,10 @@ umount /media/usb1 2>/dev/null || true
 echo -e "${GREEN}✓ Unmounted drives${NC}"
 echo ""
 
-# Step 3: Extract UUIDs from fstab
+# Step 3: Extract UUIDs from fstab (including commented lines)
 echo "Step 3: Reading UUIDs from /etc/fstab..."
-USB0_UUID=$(grep "usb0" /etc/fstab 2>/dev/null | grep -v "^#" | grep -oP 'UUID=\K[^\s]+' || echo "")
-USB1_UUID=$(grep "usb1" /etc/fstab 2>/dev/null | grep -v "^#" | grep -oP 'UUID=\K[^\s]+' || echo "")
+USB0_UUID=$(grep "usb0" /etc/fstab 2>/dev/null | sed 's/^#[^ ]* //' | grep -oP 'UUID=\K[^\s]+' || echo "")
+USB1_UUID=$(grep "usb1" /etc/fstab 2>/dev/null | sed 's/^#[^ ]* //' | grep -oP 'UUID=\K[^\s]+' || echo "")
 
 if [ -z "$USB0_UUID" ] && [ -z "$USB1_UUID" ]; then
     echo -e "${YELLOW}⚠ No UUIDs found in fstab${NC}"