diff --git a/default/bash/fns/ssh-port-forwarding b/default/bash/fns/ssh-port-forwarding
index 4ee6c924..2e77e83b 100644
--- a/default/bash/fns/ssh-port-forwarding
+++ b/default/bash/fns/ssh-port-forwarding
@@ -1,17 +1,17 @@
 # SSH Port Forwarding Functions
 fip() {
   (( $# < 2 )) && echo "Usage: fip <host> <port1> [port2] ..." && return 1
-  local host="$1"
+  local host="${1}"
   shift
   for port in "$@"; do
-    ssh -f -N -L "$port:localhost:$port" "$host" && echo "Forwarding localhost:$port -> $host:$port"
+    ssh -f -N -L "${port}:localhost:${port}" "${host}" && echo "Forwarding localhost:${port} -> ${host}:${port}"
   done
 }
 
 dip() {
   (( $# == 0 )) && echo "Usage: dip <port1> [port2] ..." && return 1
   for port in "$@"; do
-    pkill -f "ssh.*-L $port:localhost:$port" && echo "Stopped forwarding port $port" || echo "No forwarding on port $port"
+    pkill -f "ssh.*-L ${port}:localhost:${port}" && echo "Stopped forwarding port ${port}" || echo "No forwarding on port ${port}"
   done
 }