diff --git a/model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java b/model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
index efeb5eb72a4..934bd3190e3 100644
--- a/model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
+++ b/model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
@@ -386,9 +386,9 @@ public void evaluate(Task task, OperationResult parentResult) throws ExpressionE
 				recomputeValues();
 				setOrigin();
 				// TODO: output filter
-			}
 
-			checkRange(task, result);
+				checkRange(task, result);
+			}
 
 			result.recordSuccess();
 			traceSuccess(conditionResultOld, conditionResultNew);