diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/ctx/FhirContextDstu3Test.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/ctx/FhirContextDstu3Test.java
index 0d7ed35c675..2068d2d9455 100644
--- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/ctx/FhirContextDstu3Test.java
+++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/ctx/FhirContextDstu3Test.java
@@ -25,5 +25,14 @@ public class FhirContextDstu3Test {
 		assertEquals(AdministrativeGender.class, genderChild.getBoundEnumType());
 	}
 	
+	@Test
+	public void testQueryNonBoundCode() {
+		RuntimeResourceDefinition patientType = ourCtx.getResourceDefinition(Patient.class);
+		String childName = "name";
+		BaseRuntimeChildDatatypeDefinition genderChild = (BaseRuntimeChildDatatypeDefinition) patientType.getChildByName(childName);
+		ourLog.trace(genderChild.getClass().getName());
+		
+		assertEquals(null, genderChild.getBoundEnumType());
+	}
 
 }