diff --git a/recover_duts/hooks/check_ethernet.hook b/recover_duts/hooks/check_ethernet.hook
index 8e35c34..b36edbe 100755
--- a/recover_duts/hooks/check_ethernet.hook
+++ b/recover_duts/hooks/check_ethernet.hook
@@ -84,10 +84,15 @@
   return 1
 }
 
-# Return the remote IP address of the first established SSH connection
+# Return the remote IP address of an established SSH connection.
 find_ssh_client() {
-  netstat -lanp | awk '/tcp.*:22 .*ESTABLISHED.*/ {split($5,a,":");  \
-                         if (a[1] != "127.0.0.1") print a[1]}'
+  netstat -ntW | awk '$1 ~ /^tcp[6]?$/ && $4 ~ /:22$/ && $6 == "ESTABLISHED" {
+                         sub(/:[^:]*$/, "", $5);
+                         if ($5 != "127.0.0.1" && $5 != "::1") {
+                           print $5
+                           exit
+                         }
+                       }'
 }
 
 # Return the IP address of a neighbor reachable via ethernet