diff --git a/lib/Slic3r/Test.pm b/lib/Slic3r/Test.pm
index 570bca41b..8d2a79f2a 100644
--- a/lib/Slic3r/Test.pm
+++ b/lib/Slic3r/Test.pm
@@ -192,12 +192,12 @@ sub init_print {
     if (defined $params{duplicate} && $params{duplicate} > 1) {
         $model->duplicate($params{duplicate} // 1, $config->min_object_distance);
     }
-    $model->arrange_objects($config->min_object_distance);
-    $model->center_instances_around_point($params{print_center} ? Slic3r::Pointf->new(@{$params{print_center}}) : Slic3r::Pointf->new(100,100));
     foreach my $model_object (@{$model->objects}) {
         $model_object->ensure_on_bed;
         $print->auto_assign_extruders($model_object);
     }
+    $model->arrange_objects($config->min_object_distance);
+    $model->center_instances_around_point($params{print_center} ? Slic3r::Pointf->new(@{$params{print_center}}) : Slic3r::Pointf->new(100,100));
 
     $print->apply($model, $config);
     $print->validate;
diff --git a/src/libslic3r/TriangleMesh.cpp b/src/libslic3r/TriangleMesh.cpp
index 8648edc52..fba1429ea 100644
--- a/src/libslic3r/TriangleMesh.cpp
+++ b/src/libslic3r/TriangleMesh.cpp
@@ -914,7 +914,7 @@ void its_collect_mesh_projection_points_above(const indexed_triangle_set &its, c
                 float t = (z - p1.z()) / (p2.z() - p1.z());
                 all_pts.emplace_back(scaled<coord_t>(p1.x() + (p2.x() - p1.x()) * t), scaled<coord_t>(p1.y() + (p2.y() - p1.y()) * t));
             }
-            if (p2.z() > z)
+            if (p2.z() >= z)
                 all_pts.emplace_back(scaled<coord_t>(p2.x()), scaled<coord_t>(p2.y()));
             iprev = iedge;
         }