diff --git a/fixture-monkey-api/src/main/java/com/navercorp/fixturemonkey/api/property/ElementProperty.java b/fixture-monkey-api/src/main/java/com/navercorp/fixturemonkey/api/property/ElementProperty.java
index de6cb6dd9..456607eb0 100644
--- a/fixture-monkey-api/src/main/java/com/navercorp/fixturemonkey/api/property/ElementProperty.java
+++ b/fixture-monkey-api/src/main/java/com/navercorp/fixturemonkey/api/property/ElementProperty.java
@@ -156,13 +156,13 @@ public boolean equals(Object obj) {
 		}
 		ElementProperty that = (ElementProperty)obj;
 		return containerProperty.equals(that.containerProperty)
-			&& elementType.equals(that.elementType)
+			&& elementType.getType().equals(that.elementType.getType())
 			&& annotations.equals(that.annotations);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(containerProperty, elementType, annotations);
+		return Objects.hash(containerProperty, elementType.getType(), annotations);
 	}
 
 	private boolean isOptional(Class<?> type) {
diff --git a/fixture-monkey-api/src/main/java/com/navercorp/fixturemonkey/api/property/MapKeyElementProperty.java b/fixture-monkey-api/src/main/java/com/navercorp/fixturemonkey/api/property/MapKeyElementProperty.java
index 369d796f1..f4176a0fc 100644
--- a/fixture-monkey-api/src/main/java/com/navercorp/fixturemonkey/api/property/MapKeyElementProperty.java
+++ b/fixture-monkey-api/src/main/java/com/navercorp/fixturemonkey/api/property/MapKeyElementProperty.java
@@ -130,12 +130,12 @@ public boolean equals(Object obj) {
 		}
 		MapKeyElementProperty that = (MapKeyElementProperty)obj;
 		return mapProperty.equals(that.mapProperty)
-			&& keyType.equals(that.keyType)
+			&& keyType.getType().equals(that.keyType.getType())
 			&& annotations.equals(that.annotations);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(mapProperty, keyType, annotations);
+		return Objects.hash(mapProperty, keyType.getType(), annotations);
 	}
 }
diff --git a/fixture-monkey-api/src/main/java/com/navercorp/fixturemonkey/api/property/MapValueElementProperty.java b/fixture-monkey-api/src/main/java/com/navercorp/fixturemonkey/api/property/MapValueElementProperty.java
index 6b3b4247d..d59d38b92 100644
--- a/fixture-monkey-api/src/main/java/com/navercorp/fixturemonkey/api/property/MapValueElementProperty.java
+++ b/fixture-monkey-api/src/main/java/com/navercorp/fixturemonkey/api/property/MapValueElementProperty.java
@@ -125,12 +125,12 @@ public boolean equals(Object obj) {
 		}
 		MapValueElementProperty that = (MapValueElementProperty)obj;
 		return mapProperty.equals(that.mapProperty)
-			&& valueType.equals(that.valueType)
+			&& valueType.getType().equals(that.valueType.getType())
 			&& annotations.equals(that.annotations);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(mapProperty, valueType, annotations);
+		return Objects.hash(mapProperty, valueType.getType(), annotations);
 	}
 }