diff --git a/SHADE_Engine/src/Physics/Collision/CollisionShapes/SHConvexPolyhedron.cpp b/SHADE_Engine/src/Physics/Collision/CollisionShapes/SHConvexPolyhedron.cpp
index ca049ebb..0291de15 100644
--- a/SHADE_Engine/src/Physics/Collision/CollisionShapes/SHConvexPolyhedron.cpp
+++ b/SHADE_Engine/src/Physics/Collision/CollisionShapes/SHConvexPolyhedron.cpp
@@ -177,7 +177,7 @@ namespace SHADE
       for (size_t j = 0; j < FACE.vertexIndices.size(); ++j)
       {
         const int32_t TAIL = FACE.vertexIndices[j];
-        const int32_t HEAD = j + 1 < FACE.vertexIndices.size() ? FACE.vertexIndices[j + 1] : FACE.vertexIndices[0];
+        const int32_t HEAD = FACE.vertexIndices[(j + 1) % FACE.vertexIndices.size()];
 
         const uint64_t NEW_EDGE_ID   = BUILD_UINT64_FROM_UINT32S(TAIL, HEAD);
         const uint64_t TWIN_EDGE_ID  = BUILD_UINT64_FROM_UINT32S(HEAD, TAIL);