diff --git a/Configuration.h b/Configuration.h
index f57bf2d..602cf38 100644
--- a/Configuration.h
+++ b/Configuration.h
@@ -24,8 +24,8 @@ Licence: GPL
 #define CONFIGURATION_H
 
 #define NAME "RepRapFirmware"
-#define VERSION "0.36"
-#define DATE "2013-12-11"
+#define VERSION "0.37"
+#define DATE "2013-12-13"
 #define LAST_AUTHOR "reprappro.com"
 
 // Other firmware that we might switch to be compatible with.
diff --git a/GCodes.cpp b/GCodes.cpp
index f3a9932..b68a48b 100644
--- a/GCodes.cpp
+++ b/GCodes.cpp
@@ -1609,13 +1609,17 @@ bool GCodes::ActOnGcode(GCodeBuffer *gb)
   {
     code = gb->GetIValue();
     if(code == selectedHead)
-      return result;
-      
+    {
+    	if(result)
+    		HandleReply(error, gb == serialGCode, reply, 'T', code, resend);
+    	return result;
+    }
+
     error = true;
     for(int8_t i = AXES; i < DRIVES; i++)
     {
-      if(selectedHead == i - AXES)
-        reprap.GetHeat()->Standby(selectedHead + 1); // + 1 because 0 is the Bed
+    	if(selectedHead == i - AXES)
+    		reprap.GetHeat()->Standby(selectedHead + 1); // + 1 because 0 is the Bed
     }
     for(int8_t i = AXES; i < DRIVES; i++)
     {    
@@ -1628,7 +1632,7 @@ bool GCodes::ActOnGcode(GCodeBuffer *gb)
     }
 
     if(error)
-      snprintf(reply, STRING_LENGTH, "invalid T Code: %s", gb->Buffer());
+      snprintf(reply, STRING_LENGTH, "Invalid T Code: %s", gb->Buffer());
 
     if(result)
     	HandleReply(error, gb == serialGCode, reply, 'T', code, resend);
diff --git a/Release/RepRapFirmware.bin b/Release/RepRapFirmware.bin
index ae42fae..e5e6bbb 100755
Binary files a/Release/RepRapFirmware.bin and b/Release/RepRapFirmware.bin differ