diff --git a/MatterControl.Printing/GCode/GCodeMemoryFile.cs b/MatterControl.Printing/GCode/GCodeMemoryFile.cs
index 40b40c24c..4bea52b3c 100644
--- a/MatterControl.Printing/GCode/GCodeMemoryFile.cs
+++ b/MatterControl.Printing/GCode/GCodeMemoryFile.cs
@@ -446,7 +446,7 @@ namespace MatterControl.Printing
 				{
 					// don't turn of extruders if we will end the print within 10 minutes
 					if (instructionIndex < gCodeCommandQueue.Count
-						&& gCodeCommandQueue[0].SecondsToEndFromHere < PrintTimeToLeaveHeatersOn)
+						&& this.TotalSecondsInPrint < PrintTimeToLeaveHeatersOn)
 					{
 						return (toolToLookFor, gCodeCommandQueue[instructionIndex].SecondsToEndFromHere);
 					}
diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice
index 724c87220..dd5294e9e 160000
--- a/Submodules/MatterSlice
+++ b/Submodules/MatterSlice
@@ -1 +1 @@
-Subproject commit 724c87220b2777bfbac7f8156c116404431d9dc6
+Subproject commit dd5294e9e7bdd79688cd67a347d0a2976201f605