diff --git a/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java b/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java
index 73ae930eb5..5c55c3bebc 100644
--- a/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java
+++ b/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java
@@ -533,7 +533,7 @@ public class MMeasureCalc extends X_PA_MeasureCalc implements ImmutablePOSupport
 	@Override
 	public String getWhereClause() {
 		String whereClause = super.getWhereClause();
-		if (! whereClause.toLowerCase().startsWith("where "))
+		if (! whereClause.matches("(?si)\\s*where\\s+.*"))
 			whereClause = "WHERE " + whereClause;
 		return whereClause;
 	}