diff --git a/lib/sshyp.py b/lib/sshyp.py
index 8e90951..e7b7830 100755
--- a/lib/sshyp.py
+++ b/lib/sshyp.py
@@ -827,16 +827,17 @@ if __name__ == "__main__":
                     gen()
 
             elif arg_count == 2 and arg_start == 1:
-                if arg_count == 1:
-                    success_flag = True
-                    read_shortcut()
-                elif arguments[1] == 'gen':
+                if arguments[1] == 'gen':
                     success_flag, sync_flag = True, True
                     gen()
                 elif arguments[1] == 'shear':
                     success_flag, sync_flag = True, True
                     remove_data()
 
+            elif arg_count == 1 and arg_start == 1:
+                success_flag = True
+                read_shortcut()
+
         elif arg_count == 0:  # server arguments
             if arg_count > 1 and arguments[0] == 'whitelist':
                 if arguments[1] in ('list', '-l'):