diff --git a/tools/ak2-core.sh b/tools/ak2-core.sh
index b7a8a7d..b18353a 100755
--- a/tools/ak2-core.sh
+++ b/tools/ak2-core.sh
@@ -365,7 +365,7 @@ patch_fstab() {
       options) part=$(echo "$entry" | awk '{ print $4 }');;
       flags) part=$(echo "$entry" | awk '{ print $5 }');;
     esac;
-    newpart=$(echo "$part" | sed "s;${5};${6};");
+    newpart=$(echo "$part" | sed -e "s;${5};${6};" -e 's;,\{2,\};,;g' -e 's;,*$;;g' -e 's;^,;;g');
     newentry=$(echo "$entry" | sed "s;${part};${newpart};");
     sed -i "s;${entry};${newentry};" $1;
   fi;