diff --git a/oet-parser/src/main/java/org/openehr/am/template/Flattener.java b/oet-parser/src/main/java/org/openehr/am/template/Flattener.java
index a9db2108..456ba8ed 100755
--- a/oet-parser/src/main/java/org/openehr/am/template/Flattener.java
+++ b/oet-parser/src/main/java/org/openehr/am/template/Flattener.java
@@ -1265,7 +1265,8 @@ protected void applyQuantityConstraint(CComplexObject ccobj,
 			if(valueAttr != null) {
 				valueAttr.removeAllChildren();
 				CDvQuantity cdq = CDvQuantity.singleRequired(valuePath, item);
-				valueAttr.addChild(cdq);	
+				valueAttr.addChild(cdq);
+				return;
 			}
 			
 		} else if(includedUnits != null && includedUnits.length == 1) {