diff --git a/lib/Slic3r/Extruder.pm b/lib/Slic3r/Extruder.pm
index 35f6a3d470..4c88b97b89 100644
--- a/lib/Slic3r/Extruder.pm
+++ b/lib/Slic3r/Extruder.pm
@@ -85,7 +85,7 @@ sub extrude_loop {
     my $extrusion_path = $loop->split_at($start_at);
     
     # clip the path to avoid the extruder to get exactly on the first point of the loop
-    $extrusion_path->clip_end(scale $Slic3r::nozzle_diameter / 2);
+    $extrusion_path->clip_end(scale $Slic3r::flow_width * 0.15);
     
     # extrude along the path
     return $self->extrude_path($extrusion_path, $description);
diff --git a/lib/Slic3r/Fill/Concentric.pm b/lib/Slic3r/Fill/Concentric.pm
index f216f27592..5152062aa9 100644
--- a/lib/Slic3r/Fill/Concentric.pm
+++ b/lib/Slic3r/Fill/Concentric.pm
@@ -59,7 +59,7 @@ sub fill_surface {
         my $path = $loop->split_at($cur_pos);
         
         # clip the path to avoid the extruder to get exactly on the first point of the loop
-        $path->clip_end(scale $Slic3r::nozzle_diameter / 2);
+        $path->clip_end(scale $Slic3r::flow_width * 0.15);
         
         push @paths, $path->points if @{$path->points};
     }