diff --git a/src/libslic3r/PerimeterGenerator.cpp b/src/libslic3r/PerimeterGenerator.cpp
index ed6e34549..6c1658b62 100644
--- a/src/libslic3r/PerimeterGenerator.cpp
+++ b/src/libslic3r/PerimeterGenerator.cpp
@@ -683,7 +683,7 @@ void PerimeterGenerator::process()
                 last = std::move(next_onion);
                     
                 //store surface for top infill if only_one_perimeter_top
-                if(i==0 && ((layer->id() == 0 && this->config->only_one_perimeter_first_layer) || (config->only_one_perimeter_top && this->upper_slices != NULL))){
+                if(i==0 && (config->only_one_perimeter_top && this->upper_slices != NULL)){
                     if (this->config->only_one_perimeter_top_other_algo) {
                         //split the polygons with top/not_top
                         //get the offset from solid surface anchor
diff --git a/src/libslic3r/PerimeterGenerator.hpp b/src/libslic3r/PerimeterGenerator.hpp
index 8a8f976f9..3a50809bf 100644
--- a/src/libslic3r/PerimeterGenerator.hpp
+++ b/src/libslic3r/PerimeterGenerator.hpp
@@ -84,7 +84,7 @@ public:
         ExtrusionEntityCollection*  gap_fill,
         // Infills without the gap fills
         SurfaceCollection*          fill_surfaces)
-        : slices(slices), lower_slices(nullptr), upper_slices(nullptr),
+        : slices(slices), lower_slices(nullptr), upper_slices(nullptr), layer(nullptr),
             perimeter_flow(flow), ext_perimeter_flow(flow),
             overhang_flow(flow), solid_infill_flow(flow),
             config(config), object_config(object_config), print_config(print_config),