diff --git a/stpkg b/stpkg
index b7bff716f347869fa8412d2b29ca4833a662c7bd..b038ff5f548561f387113182a21d28cc3b8db708 100755
--- a/stpkg
+++ b/stpkg
@@ -858,12 +858,11 @@ __pack() {
             STICKER_STATUS="Unchanged"
             ST_JSON="`jq --arg STICKER_NAME "$STICKER_NAME" '.stickers[] | select(.body == $STICKER_NAME)' < "$DEST_INDEX"`"
         else
-            if [[ "x${updatedFiles[$FILE]}" != "x" ]]; then
-                if [ "x$UNDER_MIGRATION" = "xyes" ]; then
-                    STICKER_STATUS="`__magenta Migrated`"
-                else
-                    STICKER_STATUS="`__yellow Updated`"
-                fi
+            if [ "x$UNDER_MIGRATION" = "xyes" ]; then
+                STICKER_STATUS="`__magenta Migrated`"
+                sed -i "/[0-9a-f]\{32\}  $FILE/d" $SUM_FILE
+            elif [[ "x${updatedFiles[$FILE]}" != "x" ]]; then
+                STICKER_STATUS="`__yellow Updated`"
                 sed -i "/[0-9a-f]\{32\}  $FILE/d" $SUM_FILE
             else
                 STICKER_STATUS="`__green New`"
@@ -928,7 +927,7 @@ download_image_from_server() {
     hostname="${hostname%%/*}"
     local id="${mxc_url##*/}"
 
-    curl "https://$STPKG_HOMESERV/_matrix/client/v1/media/download/$hostname/$id/" -H "Authorization: Bearer $STPKG_TOKEN" -o $destination
+    curl "https://$STPKG_HOMESERV/_matrix/client/v1/media/download/$hostname/$id/" -H "Authorization: Bearer $STPKG_TOKEN" -o "$destination"
 }
 
 # Allows to migrate stickers from a pack to the current homeserver
@@ -948,16 +947,15 @@ __migrate() {
 
     local temporary_destination="/tmp/$pack_name"
 
-    jq '.stickers[] | "\(.body) \(.url) \(.info.mimetype)"' < "$FILE" | while IFS= read LINE; do
-        local NAME=`echo "$LINE" | awk -F '"| ' '{print $2}'`
-        local URL=` echo "$LINE" | awk -F '"| ' '{print $3}'`
-        local TYPE=`echo "$LINE" | awk -F '"| ' '{print $4}' | awk -F '/' '{print $2}'`
-        download_image_from_server $URL $NAME $TYPE $temporary_destination
+    jq -r '.stickers[] | "\(.body)|\(.url)|\(.info.mimetype)"' "$FILE" | while IFS='|' read -r NAME URL TYPE; do
+        TYPE=$(echo "$TYPE" | awk -F'/' '{print $2}')
+        download_image_from_server "$URL" "$NAME" "$TYPE" "$temporary_destination"
     done
 
     UNDER_MIGRATION="yes"
     STPKG_REUPLOAD_SAME_FILE="yes"
-    __pack $pack_name $temporary_destination
+    STPKG_NOCONVERT_FILE="yes"
+    __pack "$pack_name" "$temporary_destination"
 }
 
 __do_command() {