diff --git a/seika/ecs/entity.c b/seika/ecs/entity.c
index f8bd17e..af18e82 100644
--- a/seika/ecs/entity.c
+++ b/seika/ecs/entity.c
@@ -18,12 +18,14 @@ void ska_ecs_entity_finalize() {
     SE_ASSERT(entityIdQueue);
     se_queue_destroy(entityIdQueue);
     entityIdQueue = NULL;
+    entityIdCounter = 0;
+    activeEntityCount = 0;
 }
 
 SkaEntity ska_ecs_entity_create() {
     SE_ASSERT(entityIdQueue);
     if (se_queue_is_empty(entityIdQueue)) {
-        SE_ASSERT_FMT(entityIdCounter + 1 < SKA_MAX_ENTITIES, "Reached maxed entities ids to create, considering increasing SKA_MAX_ENTITIES!");
+        SE_ASSERT_FMT(entityIdCounter < SKA_MAX_ENTITIES, "Reached maxed entities ids to create, considering increasing SKA_MAX_ENTITIES!");
         se_queue_enqueue(entityIdQueue, entityIdCounter++);
     }
     activeEntityCount++;
diff --git a/vcpkg.json b/vcpkg.json
index afe886f..e70b039 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "seika",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "dependencies": [
     {
       "name": "sdl2",