diff --git a/bin/wg-addpeer b/bin/wg-addpeer
index 275d9a9..f40edf1 100755
--- a/bin/wg-addpeer
+++ b/bin/wg-addpeer
@@ -27,7 +27,7 @@ host_key=$(sudo wg show $wg_dev public-key)
 sudo -v -p '[sudo] password for %u@%h'
 dest_name=$(sshp hostname)
 dest_fqdn=$(sshp hostname --fqdn)
-dest_wgip=$(sshp ip -4 addr show $wg_dev | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
+dest_wgip="$(sshp ip -4 addr show $wg_dev | grep -oP '(?<=inet\s)\d+(\.\d+){3}')"
 dest_port=$(sshp sudo wg show $wg_dev listen-port)
 dest_key=$(sshp sudo wg show $wg_dev public-key)
 
@@ -37,7 +37,7 @@ sudo wg set $wg_dev peer "${dest_key}" endpoint $dest_fqdn:$dest_port allowed-ip
 echo "Configuring peer hostname on local host ..."
 search="^[0-9.]+\s+$dest_name.$wg_domain"
 replace="$dest_wgip\t$dest_name.$wg_domain"
-(grep -qE "$search" /etc/hosts && sudo sed -E "s/$search/$replace/" /etc/hosts || echo -e "$replace" | cat /etc/hosts -) | sudo tee /etc/hosts >/dev/null
+eval "(grep -qE '$search' /etc/hosts && sudo sed -E 's/$search/$replace/' /etc/hosts || echo -e '$replace' | cat /etc/hosts -) | sudo tee /etc/hosts >/dev/null"
 
 # add peer on dest
 echo "Configuring peer on remote host ..."