diff --git a/OTRestFramework.xcodeproj/project.pbxproj b/OTRestFramework.xcodeproj/project.pbxproj
index a0b5ec5b..d147d189 100644
--- a/OTRestFramework.xcodeproj/project.pbxproj
+++ b/OTRestFramework.xcodeproj/project.pbxproj
@@ -56,13 +56,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		25A5361A10370AF20086AB36 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 3F4E18D6102DD31E00320118 /* ElementParser.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 25FCE09E10360372005418A7;
-			remoteInfo = Tests;
-		};
 		3F4E18DA102DD31E00320118 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 3F4E18D6102DD31E00320118 /* ElementParser.xcodeproj */;
@@ -232,7 +225,6 @@
 			isa = PBXGroup;
 			children = (
 				3F4E18DB102DD31E00320118 /* libElementParser.a */,
-				25A5361B10370AF20086AB36 /* Tests.octest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -349,13 +341,6 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		25A5361B10370AF20086AB36 /* Tests.octest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = Tests.octest;
-			remoteRef = 25A5361A10370AF20086AB36 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		3F4E18DB102DD31E00320118 /* libElementParser.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
diff --git a/OTRestManagedModel.m b/OTRestManagedModel.m
index d95123b0..92bb6ffc 100644
--- a/OTRestManagedModel.m
+++ b/OTRestManagedModel.m
@@ -7,7 +7,7 @@
 //
 
 #import "OTRestManagedModel.h"
-
+#import <objc/runtime.h>
 
 @implementation OTRestManagedModel
 
@@ -15,7 +15,8 @@
 #pragma mark NSManagedObject helper methods
 
 + (NSEntityDescription*)entity {
-	return [NSEntityDescription entityForName:[[self class] className] inManagedObjectContext:context];
+	NSString* className = [NSString stringWithCString:class_getName([self class])];
+	return [NSEntityDescription entityForName:className inManagedObjectContext:context];
 }
 
 + (NSFetchRequest*)request {