diff --git a/MatterControlLib/SlicerConfiguration/MappingClasses/MapStartGCode.cs b/MatterControlLib/SlicerConfiguration/MappingClasses/MapStartGCode.cs
index 6c96f9e07..b8fa7e5ba 100644
--- a/MatterControlLib/SlicerConfiguration/MappingClasses/MapStartGCode.cs
+++ b/MatterControlLib/SlicerConfiguration/MappingClasses/MapStartGCode.cs
@@ -125,6 +125,13 @@ namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
 			SwitchToFirstActiveExtruder(extrudersUsed, preStartGCodeLines, preStartGCode);
 			preStartGCode.Add("; settings from start_gcode");
 
+			// preserver the legacy behavior of finishing heating the bed before we continue with the start gcode
+			if (bed_temperature > 0)
+			{
+				string setBedTempString = string.Format("M190 S{0}", bed_temperature);
+				AddDefaultIfNotPresent(preStartGCode, setBedTempString, preStartGCodeLines, "wait for bed temperature to be reached");
+			}
+
 			return preStartGCode;
 		}
 
@@ -136,13 +143,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
 			List<string> postStartGCode = new List<string>();
 			postStartGCode.Add("; automatic settings after start_gcode");
 
-			double bed_temperature = printer.Settings.GetValue<double>(SettingsKey.bed_temperature);
-			if (bed_temperature > 0)
-			{
-				string setBedTempString = string.Format("M190 S{0}", bed_temperature);
-				AddDefaultIfNotPresent(postStartGCode, setBedTempString, postStartGCodeLines, "wait for bed temperature to be reached");
-			}
-
 			int numberOfHeatedExtruders = printer.Settings.GetValue<int>(SettingsKey.extruder_count);
 			// wait for them to finish
 			for (int extruderIndex0Based = 0; extruderIndex0Based < numberOfHeatedExtruders; extruderIndex0Based++)
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index bd9fd12e9..fc3b1bc09 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit bd9fd12e92058eaa83ea8ebdc728559414e9f33e
+Subproject commit fc3b1bc09afa50d87b41001e2c78f249e3b33592