diff --git a/zssh.funcs.zsh b/zssh.funcs.zsh
index 3c8dc07..b3220b0 100644
--- a/zssh.funcs.zsh
+++ b/zssh.funcs.zsh
@@ -137,9 +137,9 @@ 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} -K)/$zssh_host.key.pub" ]]
   then 
-    zshlibs_ensure -d $(zssh_node_info ${ssh_node} -K)
+    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})"
   else