diff --git a/encompass-cs/Collections/ComponentStore.cs b/encompass-cs/Collections/ComponentStore.cs
index 0645510..dbe1a95 100644
--- a/encompass-cs/Collections/ComponentStore.cs
+++ b/encompass-cs/Collections/ComponentStore.cs
@@ -33,7 +33,7 @@ namespace Encompass
 
         private TypedComponentStore<TComponent> Lookup<TComponent>() where TComponent : struct, IComponent
         {
-            //RegisterComponentType<TComponent>();
+            if (!Stores.ContainsKey(typeof(TComponent))) { RegisterComponentType<TComponent>(); }
             return Stores[typeof(TComponent)] as TypedComponentStore<TComponent>;
         }