diff --git a/src/tm_mad/tm_common.sh b/src/tm_mad/tm_common.sh
index 27ad3d0e12..8597c54cc5 100644
--- a/src/tm_mad/tm_common.sh
+++ b/src/tm_mad/tm_common.sh
@@ -232,8 +232,11 @@ function qcow_dir_cmd
     local DST_FILE
 
     DST_FILE=$(basename "$DST_PATH")
+    DST_DIR=$(dirname "$DST_PATH")
 
     echo "set -e -o pipefail"
+    echo "pushd ${DST_DIR}"
+
     echo "rm -rf ${DST_PATH}.snap"
     echo "mkdir -p ${DST_PATH}.snap"
 
@@ -248,5 +251,6 @@ function qcow_dir_cmd
     echo "rm -f $DST_PATH"
     echo "cd ${DST_PATH}.snap"
     echo "ln -sf . ${DST_FILE}.snap"
-    echo "ln -sf ${DST_PATH}.snap/0 $DST_PATH"
+    echo "ln -sf ${DST_FILE}.snap/0 $DST_PATH"
+    echo "popd"
 }