diff --git a/Nuake/src/Resource/Prefab.h b/Nuake/src/Resource/Prefab.h
index 1d476a3b..6e0241f2 100644
--- a/Nuake/src/Resource/Prefab.h
+++ b/Nuake/src/Resource/Prefab.h
@@ -71,8 +71,13 @@ namespace Nuake {
 			{
 				for (json e : j["Entities"])
 				{
-					Entity entity = Entity { Engine::GetCurrentScene()->m_Registry.create(), Engine::GetCurrentScene().get() };
+					Entity entity = Engine::GetCurrentScene()->CreateEntity("-");
+					auto& nameComponent = entity.GetComponent<NameComponent>();
+
+					int entityId = nameComponent.ID;
 					entity.Deserialize(e.dump());
+					nameComponent.ID = entityId;
+
 					this->AddEntity(entity);
 				}