diff --git a/seika/ecs/component.c b/seika/ecs/component.c
index ab0587c..170ab2a 100644
--- a/seika/ecs/component.c
+++ b/seika/ecs/component.c
@@ -121,6 +121,7 @@ void ska_ecs_component_manager_finalize() {
     }
     se_string_hash_map_destroy(componentNameToTypeMap);
     componentNameToTypeMap = NULL;
+    globalComponentIndex = 0;
 
     SE_ASSERT_FMT(componentManager != NULL, "Component Manager is NULL when trying to finalize...");
     SE_MEM_FREE(componentManager);
diff --git a/vcpkg.json b/vcpkg.json
index e70b039..0fb40e7 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "seika",
-  "version": "0.0.35",
+  "version": "0.0.36",
   "dependencies": [
     {
       "name": "sdl2",