diff --git a/src/main/java/org/springframework/persistence/graph/neo4j/Neo4jNodeBacking.aj b/src/main/java/org/springframework/persistence/graph/neo4j/Neo4jNodeBacking.aj
index f331bea22..dd5df47c1 100644
--- a/src/main/java/org/springframework/persistence/graph/neo4j/Neo4jNodeBacking.aj
+++ b/src/main/java/org/springframework/persistence/graph/neo4j/Neo4jNodeBacking.aj
@@ -124,7 +124,7 @@ public aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEn
 		Field f = fieldSignature.getField();
 		
 		// TODO fix arrays, TODO serialize other types as byte[] or string (for indexing, querying) via Annotation
-		if (f.getType().isPrimitive() || f.getType().equals(String.class)) {
+		if (isPropertyType(f.getType())) {
 			String propName = getNeo4jPropertyName(f);
 			log.info("GET " + f + " <- Neo4J simple node property [" + propName + "]");
 			return entity.getUnderlyingNode().getProperty(propName, null);
diff --git a/src/test/java/org/springframework/persistence/test/graph/Neo4jGraphPersistenceTest.java b/src/test/java/org/springframework/persistence/test/graph/Neo4jGraphPersistenceTest.java
index 3e2177815..8c4ae1f79 100644
--- a/src/test/java/org/springframework/persistence/test/graph/Neo4jGraphPersistenceTest.java
+++ b/src/test/java/org/springframework/persistence/test/graph/Neo4jGraphPersistenceTest.java
@@ -70,6 +70,7 @@ public class Neo4jGraphPersistenceTest {
 		Assert.assertEquals("Michael", p.getUnderlyingNode().getProperty("Person.name"));
 		Assert.assertEquals(35, p.getUnderlyingNode().getProperty("Person.age"));
 		Assert.assertEquals((short)182, p.getUnderlyingNode().getProperty("Person.height"));
+		Assert.assertEquals((short)182, (short)p.getHeight());
 	}
 	
 	@Test