diff --git a/Source/AlecrimCoreData/Core/Structs/Table.swift b/Source/AlecrimCoreData/Core/Structs/Table.swift
index 41642a2..efbba5b 100644
--- a/Source/AlecrimCoreData/Core/Structs/Table.swift
+++ b/Source/AlecrimCoreData/Core/Structs/Table.swift
@@ -44,7 +44,11 @@ extension NSPersistentStoreCoordinator {
             entityDescription = cachedEntityDescription
         }
         else {
-            entityDescription = self.managedObjectModel.entities.filter({ $0.managedObjectClassName == managedObjectClassName }).first!
+            entityDescription = self.managedObjectModel.entities
+                .filter {
+                    $0.managedObjectClassName.components(separatedBy: ".").last! == managedObjectClassName }
+                .first!
+            
             self.cachedEntityDescriptions[managedObjectClassName] = entityDescription
         }