diff --git a/src/freedombone-format b/src/freedombone-format
index 96ea836a..967668c4 100755
--- a/src/freedombone-format
+++ b/src/freedombone-format
@@ -38,8 +38,10 @@ if [ ! $1 ]; then
    exit 1
 fi
 
+USB_DRIVE_SHORT=${1}
 if [[ "$1" == "/dev/"* ]]; then
     USB_DRIVE=$1
+    USB_DRIVE_SHORT=$(echo "$USB_DRIVE" | awk -F '/' '{print $3}' | sed 's|1||g' | sed 's|2||g' | sed 's|3||g')
 else
     USB_DRIVE=/dev/${1}1
 fi
@@ -60,7 +62,7 @@ p
 a
 1
 w
-" | fdisk /dev/${1};mkfs.ext4 -L "$LABEL" /dev/${1}1
+" | fdisk /dev/${USB_DRIVE_SHORT};mkfs.ext4 -L "$LABEL" /dev/${USB_DRIVE_SHORT}1
 
 echo $"Formatting $USB_DRIVE as LUKS"
 cryptsetup -y -v luksFormat ${USB_DRIVE}