diff --git a/src/mad/sh/scripts_common.sh b/src/mad/sh/scripts_common.sh
index d499d6db1d..addd2ba59c 100755
--- a/src/mad/sh/scripts_common.sh
+++ b/src/mad/sh/scripts_common.sh
@@ -327,9 +327,8 @@ function iqn_get_vg_name {
 
 function iqn_get_host {
     IQN="$1"
-
+    TARGET=`echo "$IQN"|$CUT -d: -f2`
     LV_NAME=$(iqn_get_lv_name "$IQN")
     VG_NAME=$(iqn_get_vg_name "$IQN")
-
     echo ${TARGET%%.$VG_NAME.$LV_NAME}
 }
diff --git a/src/tm_mad/iscsi/mv b/src/tm_mad/iscsi/mv
index 38005f85b4..21cc55bdd2 100755
--- a/src/tm_mad/iscsi/mv
+++ b/src/tm_mad/iscsi/mv
@@ -110,7 +110,6 @@ if is_iscsi "$DST_HOST"; then
         set -e
         mkdir -p $DST_DIR
         $SUDO $(iscsiadm_discovery "$TARGET_HOST")
-        $SUDO $(iscsiadm_discovery "$TARGET_HOST")
         $SUDO $(iscsiadm_login "$IQN" "$TARGET_HOST")
         sleep 1
         DISK_BY_PATH=\$(ls /dev/disk/by-path/*$IQN-lun-1)
diff --git a/src/tm_mad/ssh/mv b/src/tm_mad/ssh/mv
index 4d929d8d44..90c4143dec 100755
--- a/src/tm_mad/ssh/mv
+++ b/src/tm_mad/ssh/mv
@@ -44,6 +44,9 @@ DST_HOST=`arg_host $DST`
 
 DST_DIR=`dirname $DST_PATH`
 
+SRC_DS_DIR=`dirname  $SRC_PATH`
+SRC_VM_DIR=`basename $SRC_PATH`
+
 if [ `is_disk $DST_PATH` -eq 1 ]; then
 	exit 0
 fi
@@ -60,7 +63,7 @@ log "Moving $SRC to $DST"
 ssh_exec_and_log "$DST_HOST" "rm -rf '$DST_PATH'" \
     "Error removing target path to prevent overwrite errors"
 
-TAR_COPY="$SSH $SRC_HOST '$TAR -C $SRC_PATH/.. -cf - .'"
+TAR_COPY="$SSH $SRC_HOST '$TAR -C $SRC_DS_DIR -cf - $SRC_VM_DIR'"
 TAR_COPY="$TAR_COPY | $SSH $DST_HOST '$TAR -C $DST_DIR -xf -'"
 
 exec_and_log "eval $TAR_COPY" "Error copying disk directory to target host"