diff --git a/cubesatsim/cubesatsim.ino b/cubesatsim/cubesatsim.ino
index c59a74fc..af829cf1 100644
--- a/cubesatsim/cubesatsim.ino
+++ b/cubesatsim/cubesatsim.ino
@@ -2333,9 +2333,11 @@ void read_payload()
     sprintf(str, "XS %.1f 0.0\n", Temp);
     strcat(payload_str, str);
 	  
-    if (debug_mode)	  
+    if ((debug_mode) || (payload_command == PAYLOAD_QUERY) {
+      payload_command = false;	    
       print_string(payload_str);
-
+    }
+	  
 /*	  
     if (result == 'R') {
       Serial.println("OK");
@@ -3818,7 +3820,7 @@ void prompt_for_input() {
       get_serial_char();
       if ((serial_string[0] == 'y') || (serial_string[0] == 'Y'))	{  
         Serial.println("Setting Simulated telemetry to on");
-	sim_mode = true;      
+	config_simulated_telem();     
       } else if ((serial_string[0] == 'n') || (serial_string[0] == 'N')) {	      
         Serial.println("Setting Simulated telemetry to off");
 	sim_mode = false;