diff --git a/lib/Slic3r/GCode.pm b/lib/Slic3r/GCode.pm
index 86f532589a..1b7194bf90 100644
--- a/lib/Slic3r/GCode.pm
+++ b/lib/Slic3r/GCode.pm
@@ -455,6 +455,7 @@ sub point_to_gcode {
 sub set_extruder {
     my ($self, $extruder_id) = @_;
     
+    $self->placeholder_parser->set('current_extruder', $extruder_id);
     return "" if !$self->writer->need_toolchange($extruder_id);
     
     # if we are running a single-extruder setup, just set the extruder and return nothing