diff --git a/zssh.funcs.zsh b/zssh.funcs.zsh
index 0cb164f..cb09e40 100644
--- a/zssh.funcs.zsh
+++ b/zssh.funcs.zsh
@@ -137,11 +137,11 @@ function zssh_mail_pubkey2()
 {
   [[ -n $zssh_host ]] || return 63
   ssh_node="$1"
-  if ! [[ "$(zssh_node_info ${ssh_node} -k)" -ot "$(zssh_node_info ${ssh_node} -K)/$zssh_host.key.pub" ]]
+  if ! [[ "$(zssh_node_info ${ssh_node} -k)" -ot "$(zssh_node_info ${ssh_node} -M ${zssh_host})" ]]
   then 
     zshlibs_ensure -d "$(zssh_node_info ${ssh_node} -K)"
-    zshlibs_log zssh_client "sending '$(zssh_node_info ${ssh_node} -k) to '$(zssh_node_info ${ssh_node} -K ${zssh_host})'"
-    cp "$(zssh_node_info ${ssh_node} -k)" "$(zssh_node_info ${ssh_node} -K ${zssh_host})"
+    zshlibs_log zssh_client "sending '$(zssh_node_info ${ssh_node} -k) to '$(zssh_node_info ${ssh_node} -M ${zssh_host})'"
+    cp -T "$(zssh_node_info ${ssh_node} -k)" "$(zssh_node_info ${ssh_node} -M ${zssh_host})"
   else
     zshlibs_log zssh_client "'$(zssh_node_info ${ssh_node} -K ${zssh_host})' already mailed"
   fi