diff --git a/lib/Slic3r/Print/GCode.pm b/lib/Slic3r/Print/GCode.pm
index 84c5e6f75..5726b362a 100644
--- a/lib/Slic3r/Print/GCode.pm
+++ b/lib/Slic3r/Print/GCode.pm
@@ -294,6 +294,8 @@ sub export {
                     $self->process_layer($obj_idx, $layer, $layer->object->_shifted_copies);
                 }
             }
+            $gcodegen->placeholder_parser->set('layer_z' => $print_z);
+            $gcodegen->placeholder_parser->set("layer_num" => $gcodegen->layer_index);
         }
         $self->flush_filters;
     }