diff --git a/base/src/org/compiere/model/MCostElement.java b/base/src/org/compiere/model/MCostElement.java
index 9837b969f7..acd86806fc 100644
--- a/base/src/org/compiere/model/MCostElement.java
+++ b/base/src/org/compiere/model/MCostElement.java
@@ -92,9 +92,9 @@ public class MCostElement extends X_M_CostElement
 	 */
 	public static MCostElement getMaterialCostElement(Properties ctx, String CostingMethod)
 	{
-		final String whereClause = "CostingMethod=?";
+		final String whereClause = "CostingMethod=? AND CostElementType=? ";
 		List<MCostElement> list = new Query(ctx, I_M_CostElement.Table_Name, whereClause, null)
-		.setParameters(CostingMethod)
+		.setParameters(CostingMethod,"M")
 		.setClient_ID()
 		.setOrderBy(I_M_CostElement.COLUMNNAME_AD_Org_ID)
 		.list();