diff --git a/legacy/checkms/checkms.sh b/legacy/checkms/checkms.sh
index 7c0db74..e61357c 100755
--- a/legacy/checkms/checkms.sh
+++ b/legacy/checkms/checkms.sh
@@ -236,10 +236,13 @@ $REMOTE bash -s <<EOF
       {
         code="NA"; ip="NA";
         for (i=1;i<=NF;i++) {
-          if (\$i ~ /\(S[0-9]+\)/) { t=\$i; gsub(/[()]/,"",t); code=t }
-          else if (\$i ~ /^S[0-9]+/) { code=\$i }
-          if (\$i ~ /^\[[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\]$/) {
-            ip=\$i; gsub(/[\[\]]/,"",ip)
+          if (\$i ~ /\(S[0-9]+\)/) { t=\$i; gsub(/[()]/,"",t); sub(/\\.$/,"",t); code=t }
+          else if (\$i ~ /^S[0-9]+/) { code=\$i; sub(/\\.$/,"",code) }
+          if (\$i ~ /^\[[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/) {
+            ip=\$i; gsub(/^\[|\].*$/,"",ip)
+          }
+          else if (ip == "NA" && \$i ~ /^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/) {
+            ip=\$i
           }
         }
         print code, ip