diff --git a/files/diskspreparation.sh b/files/diskspreparation.sh
index fc3b966920aaf4503d39b9571f231151a339522a..88b5c90cfa90ef674f76990b3bb18e1234e383ea 100755
--- a/files/diskspreparation.sh
+++ b/files/diskspreparation.sh
@@ -345,6 +345,11 @@ generateFSTab() {
       dmp=$(echo ${part} | cut -f 5 -d ";") 
       pass=$(echo ${part} | cut -f 6 -d ";") 
       
+      if [ "${fs}" = "" ];
+      then
+        fs=$(echo ${part} | cut -f 2 -d ";") 
+      fi
+
       if [ "${fs}" = "swap" -o "${fs}" = "linux-swap" ];
       then
         mntpnt="none"
@@ -396,6 +401,12 @@ createTargetDirectoryLayout(){
       fs=$(blkid -s TYPE -o value ${partdev})
       mntpnt=$(echo ${part} | cut -f 3 -d ";") 
       opts=$(echo ${part} | cut -f 4 -d ";") 
+
+      if [ "${fs}" = "" ];
+      then
+        fs=$(echo ${part} | cut -f 2 -d ";") 
+      fi
+
       if [ "${fs}" = "swap" -o "${fs}" = "linux-swap" ];
       then
         mntpnt="none"