diff --git a/src/freedombone-keydrive b/src/freedombone-keydrive
index 7f94983f..80f5687c 100755
--- a/src/freedombone-keydrive
+++ b/src/freedombone-keydrive
@@ -145,14 +145,13 @@ cd $FRAGMENTS_DIR
 no_of_usb_shares=$(ls -afq keyshare.asc.* | wc -l)
 if [ ! "$?" = "0" ]; then
     no_of_usb_shares=0
-else
-    no_of_usb_shares=$((no_of_usb_shares - 2))
 fi
 if (( no_of_usb_shares > 0 )); then
-  echo "A key fragment already exists on the drive for the user $MY_USERNAME"
-  umount -f $USB_MOUNT
-  rm -rf $USB_MOUNT
-  exit 58945
+    echo "A key fragment already exists on the drive for the user $MY_USERNAME"
+    cd ~/
+    umount -f $USB_MOUNT
+    rm -rf $USB_MOUNT
+    exit 58945
 fi
 
 # copy a random fragment to the drive
@@ -166,8 +165,6 @@ cd $LOCAL_FRAGMENTS_DIR
 no_of_local_shares=$(ls -afq keyshare.asc.* | wc -l)
 if [ ! "$?" = "0" ]; then
     no_of_local_shares=0
-else
-    no_of_local_shares=$((no_of_local_shares - 2))
 fi
 if (( no_of_local_shares < 3 )); then
     freedombone-splitkey -u $MY_USERNAME
@@ -175,13 +172,12 @@ if (( no_of_local_shares < 3 )); then
     no_of_local_shares=$(ls -afq keyshare.asc.* | wc -l)
     if [ ! "$?" = "0" ]; then
         no_of_local_shares=0
-    else
-        no_of_local_shares=$((no_of_local_shares - 2))
     fi
 fi
 
 if (( no_of_local_shares < 3 )); then
     echo "Not enough key fragments available ${no_of_local_shares}"
+    cd ~/
     umount -f $USB_MOUNT
     rm -rf $USB_MOUNT
     exit 63386
@@ -193,7 +189,7 @@ SHARE_FILENAME=${share_files[RANDOM % ${#share_files[@]}]}
 cp -f $SHARE_FILENAME $FRAGMENTS_DIR
 cd $FRAGMENTS_DIR
 no_of_usb_shares=$(ls -afq keyshare.asc.* | wc -l)
-no_of_usb_shares=$((no_of_usb_shares - 2))
+echo "Number of fragments on the drive: ${no_of_usb_shares}"
 if (( no_of_usb_shares > 1 )); then
     echo "Too many key fragments exist in $FRAGMENTS_DIR"
     ls $FRAGMENTS_DIR
@@ -204,12 +200,14 @@ if (( no_of_usb_shares > 1 )); then
 fi
 if (( no_of_usb_shares <= 0 )); then
     echo "There was a problem copying the key fragment to $USB_DRIVE"
+    echo "Files found: ${no_of_usb_shares}"
     ls $FRAGMENTS_DIR
     cd ~/
     umount -f $USB_MOUNT
     rm -rf $USB_MOUNT
     exit 54292
 fi
+
 cd ~/
 umount -f $USB_MOUNT
 rm -rf $USB_MOUNT