                 break;
 
                 case 'H':
-                if (Modem_CommandBuffer[i+1] == '0')
-                  Modem_CommandBuffer[i++]; 
+                switch(Modem_CommandBuffer[i++])
+                {
+                    case '0':
+                    suppressOkError = true;
                     Modem_Disconnect();
+                    break;
+
+                    /*case '1':
+                    // Future
+                    break;*/
+
+                    default:
+                    i--;                        // User entered ATH
+                    suppressOkError = true;
+                    Modem_Disconnect();
+                    break;
+                }
                 break;
                 
                 case 'Q':

    if (Modem_DCDFollowsRemoteCarrier)
        digitalWriteFast(C64_DCD, Modem_ToggleCarrier(true));

    //CheckTelnet();
     
    Modem_isConnected = true;
    Modem_isCommandMode = false;

    // Idle here until connected
    while (!wifly.isConnected())  {}
    C64Println(F("Incoming Connection"));
    CheckTelnet();
    TerminalMode();
}
// ----------------------------------------------------------
