diff --git a/src/libslic3r/Arrange/Items/SimpleArrangeItem.hpp b/src/libslic3r/Arrange/Items/SimpleArrangeItem.hpp
index 1d924c1861..54d7866ba1 100644
--- a/src/libslic3r/Arrange/Items/SimpleArrangeItem.hpp
+++ b/src/libslic3r/Arrange/Items/SimpleArrangeItem.hpp
@@ -141,12 +141,12 @@ template<> struct NFPArrangeItemTraits_<SimpleArrangeItem>
 
     static Vec2crd fixed_centroid(const SimpleArrangeItem &itm) noexcept
     {
-        return itm.shape().centroid();
+        return itm.outline().centroid();
     }
 
     static Vec2crd envelope_centroid(const SimpleArrangeItem &itm) noexcept
     {
-        return itm.shape().centroid();
+        return itm.outline().centroid();
     }
 };
 
diff --git a/tests/arrange/test_arrange.cpp b/tests/arrange/test_arrange.cpp
index 578fc573b6..0cb2c21511 100644
--- a/tests/arrange/test_arrange.cpp
+++ b/tests/arrange/test_arrange.cpp
@@ -937,7 +937,8 @@ TEST_CASE("Optimal nfp position search with GravityKernel using RectangleItem an
     }
 }
 
-TEST_CASE("RectangleOverfitPackingStrategy test", "[arrange2]")
+TEMPLATE_TEST_CASE("RectangleOverfitPackingStrategy test", "[arrange2]",
+                   Slic3r::arr2::SimpleArrangeItem, Slic3r::arr2::ArrangeItem)
 {
     using Slic3r::arr2::RectangleOverfitPackingStrategy;
     using Slic3r::arr2::PackStrategyNFP;
@@ -946,7 +947,7 @@ TEST_CASE("RectangleOverfitPackingStrategy test", "[arrange2]")
 
     namespace firstfit = Slic3r::arr2::firstfit;
 
-    using ArrItem = Slic3r::arr2::SimpleArrangeItem;
+    using ArrItem = TestType;
 
     auto frontleft_align_fn = [](const Slic3r::BoundingBox &bedbb,
                                  const Slic3r::BoundingBox &pilebb) {