diff --git a/lib/blimpy/box.rb b/lib/blimpy/box.rb
index 4214fec..7a53c6c 100644
--- a/lib/blimpy/box.rb
+++ b/lib/blimpy/box.rb
@@ -198,10 +198,12 @@ module Blimpy
     end
 
     def ssh_commands(*args)
-      ['ssh', '-o', 'PasswordAuthentication=no',
-          '-o', 'StrictHostKeyChecking=no',
-          '-p', (ssh_port||22).to_s,
-          '-l', username, dns, *args]
+      cmds = ['ssh', '-o', 'PasswordAuthentication=no',
+          '-o', 'StrictHostKeyChecking=no' ]
+      if (ssh_port)
+        cmds += [-p, ssh_port.to_s]
+      end
+      cmds += ['-l', username, dns, *args]
     end
 
     def ssh_into(*args)