diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index f0bac05a8d..d7321c92f7 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -4274,15 +4274,16 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
                     
                 }
             }
-            gcode +=
-                m_writer.extrude_to_xy(p, e_per_mm * line_length, GCodeWriter::full_gcode_comment ? description : "");
-
-            prev = p;
             double new_speed = std::max((float)EXTRUDER_CONFIG(slow_down_min_speed), processed_point.speed) * 60.0;
             if (last_set_speed != new_speed) {
                 gcode += m_writer.set_speed(new_speed, "", comment);
                 last_set_speed = new_speed;
             }
+            gcode +=
+                m_writer.extrude_to_xy(p, e_per_mm * line_length, GCodeWriter::full_gcode_comment ? description : "");
+
+            prev = p;
+
         }
         if (is_overhang_fan_on) {
             is_overhang_fan_on = false;
diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
index 1283e482a7..0931238298 100644
--- a/src/libslic3r/Preset.cpp
+++ b/src/libslic3r/Preset.cpp
@@ -3189,7 +3189,7 @@ namespace PresetUtils {
                 out = Slic3r::resources_dir() + "/profiles/" + preset.vendor->id + "/" + pm->hotend_model;
         }
         
-        if(out.empty())
+        if (out.empty() ||!boost::filesystem::exists(boost::filesystem::path(out)))
             out = Slic3r::resources_dir() + "/profiles/hotend.stl";
         return out;
     }
diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp
index 30f07ee415..ff2df1286b 100644
--- a/src/libslic3r/PresetBundle.cpp
+++ b/src/libslic3r/PresetBundle.cpp
@@ -504,7 +504,7 @@ std::string PresetBundle::get_hotend_model_for_printer_model(std::string model_n
             out = Slic3r::resources_dir() + "/profiles/" + vendor_name + "/" + hotend_stl;
     }
 
-    if (out.empty())
+    if (out.empty() ||!boost::filesystem::exists(boost::filesystem::path(out)))
         out = Slic3r::resources_dir() + "/profiles/hotend.stl";
 
     return out;