diff --git a/TombEngine/Game/control/event.h b/TombEngine/Game/control/event.h
index 2c39d7cdb..67cd532bc 100644
--- a/TombEngine/Game/control/event.h
+++ b/TombEngine/Game/control/event.h
@@ -8,7 +8,7 @@ namespace TEN::Control::Volumes
 {
 	using Activator = std::variant<
 		std::nullptr_t,
-		int,
+		short,
 		MESH_INFO*,
 		CAMERA_INFO*>;
 
diff --git a/TombEngine/Scripting/Internal/TEN/Objects/Moveable/MoveableObject.cpp b/TombEngine/Scripting/Internal/TEN/Objects/Moveable/MoveableObject.cpp
index f3f499d61..7308d8cf2 100644
--- a/TombEngine/Scripting/Internal/TEN/Objects/Moveable/MoveableObject.cpp
+++ b/TombEngine/Scripting/Internal/TEN/Objects/Moveable/MoveableObject.cpp
@@ -525,9 +525,9 @@ void SetLevelFuncCallback(const TypeOrNil<LevelFunc>& cb, const std::string& cal
 
 }
 
-int Moveable::GetIndex() const
+short Moveable::GetIndex() const
 {
-	return (int)m_num;
+	return m_num;
 }
 
 void Moveable::SetOnHit(const TypeOrNil<LevelFunc>& cb)
diff --git a/TombEngine/Scripting/Internal/TEN/Objects/Moveable/MoveableObject.h b/TombEngine/Scripting/Internal/TEN/Objects/Moveable/MoveableObject.h
index 2cc1d5cc7..2ad56a48a 100644
--- a/TombEngine/Scripting/Internal/TEN/Objects/Moveable/MoveableObject.h
+++ b/TombEngine/Scripting/Internal/TEN/Objects/Moveable/MoveableObject.h
@@ -136,7 +136,7 @@ public:
 	friend bool operator ==(const Moveable&, const Moveable&);
 	friend void SetLevelFuncCallback(const TypeOrNil<LevelFunc>& cb, const std::string& callerName, Moveable& mov, std::string& toModify);
 
-	int GetIndex() const;
+	short GetIndex() const;
 
 protected:
 	ItemInfo* m_item;