diff --git a/src/protocols/CursorShape.cpp b/src/protocols/CursorShape.cpp
index 9b76b767..812afe53 100644
--- a/src/protocols/CursorShape.cpp
+++ b/src/protocols/CursorShape.cpp
@@ -1,5 +1,6 @@
 #include "CursorShape.hpp"
 #include <algorithm>
+#include "../helpers/CursorShapes.hpp"
 
 #define LOGM PROTO::cursorShape->protoLog
 
@@ -42,7 +43,7 @@ void CCursorShapeProtocol::createCursorShapeDevice(CWpCursorShapeManagerV1* pMgr
 }
 
 void CCursorShapeProtocol::onSetShape(CWpCursorShapeDeviceV1* pMgr, uint32_t serial, wpCursorShapeDeviceV1Shape shape) {
-    if ((uint32_t)shape == 0 || (uint32_t)shape > sizeof(SHAPE_NAMES)) {
+    if ((uint32_t)shape == 0 || (uint32_t)shape > CURSOR_SHAPE_NAMES.size()) {
         pMgr->error(WP_CURSOR_SHAPE_DEVICE_V1_ERROR_INVALID_SHAPE, "The shape is invalid");
         return;
     }
@@ -50,7 +51,7 @@ void CCursorShapeProtocol::onSetShape(CWpCursorShapeDeviceV1* pMgr, uint32_t ser
     SSetShapeEvent event;
     event.pMgr      = pMgr;
     event.shape     = shape;
-    event.shapeName = SHAPE_NAMES[shape];
+    event.shapeName = CURSOR_SHAPE_NAMES.at(shape);
 
     events.setShape.emit(event);
 }
\ No newline at end of file