diff --git a/lib/Slic3r/Config.pm b/lib/Slic3r/Config.pm
index 1bb5b7bcd..3e246691e 100644
--- a/lib/Slic3r/Config.pm
+++ b/lib/Slic3r/Config.pm
@@ -314,7 +314,7 @@ sub validate {
     
     # --solid-layers
     die "Invalid value for --solid-layers\n"
-        if $Slic3r::solid_layers < 1;
+        if $Slic3r::solid_layers < 0;
     
     # --print-center
     die "Invalid value for --print-center\n"
diff --git a/lib/Slic3r/Fill.pm b/lib/Slic3r/Fill.pm
index 219aa81e4..366d037e8 100644
--- a/lib/Slic3r/Fill.pm
+++ b/lib/Slic3r/Fill.pm
@@ -90,7 +90,7 @@ sub make_fill {
         my $is_solid = $surface->surface_type =~ /^(top|bottom)$/;
         
         # force 100% density and rectilinear fill for external surfaces
-        if ($surface->surface_type ne 'internal') {
+        if (($surface->surface_type ne 'internal') && ($Slic3r::solid_layers >= 1)) {
             $density = 1;
             $filler = $is_bridge ? 'rectilinear' : $Slic3r::solid_fill_pattern;
             $flow_width = $Slic3r::nozzle_diameter if $is_bridge;