diff --git a/src/irregular/shape.cpp b/src/irregular/shape.cpp
index 6cb2223da..7a2e740ad 100644
--- a/src/irregular/shape.cpp
+++ b/src/irregular/shape.cpp
@@ -497,7 +497,7 @@ std::pair<Point, Point> Shape::compute_min_max(
         y_max = std::max(y_max, point.y);
 
         if (element.type == ShapeElementType::CircularArc) {
-            LengthDbl radius = distance(elements.front().center, elements.front().start);
+            LengthDbl radius = distance(element.center, element.start);
             Angle starting_angle = irregular::angle_radian(element.start - element.center);
             Angle ending_angle = irregular::angle_radian(element.end - element.center);
             if (!element.anticlockwise)
diff --git a/src/irregular/shape_convex_hull.hpp b/src/irregular/shape_convex_hull.hpp
index 4c25fa966..0d8c7beca 100644
--- a/src/irregular/shape_convex_hull.hpp
+++ b/src/irregular/shape_convex_hull.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "packingsolver/irregular/instance.hpp"
+#include "packingsolver/irregular/shape.hpp"
 
 namespace packingsolver
 {