diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/Element.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/Element.java
index c671d79e5..70b837ca6 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/Element.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/Element.java
@@ -613,7 +613,8 @@ public class Element extends Base implements NamedItem {
 
 	@Override
 	public boolean hasPrimitiveValue() {
-		return property.isPrimitiveName(name) || property.IsLogicalAndHasPrimitiveValue(name);
+		//return property.isPrimitiveName(name) || property.IsLogicalAndHasPrimitiveValue(name);
+	  return super.hasPrimitiveValue();
 	}
 	
 
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Base.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Base.java
index 0e105150a..8d0e8e7e9 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Base.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Base.java
@@ -267,7 +267,7 @@ public abstract class Base implements Serializable, IBase, IElement {
   }
 
 	public boolean hasPrimitiveValue() {
-		return isPrimitive();
+		return primitiveValue() != null;
 	}
 	
 	public String primitiveValue() {