diff --git a/base/src/org/adempiere/util/ModelClassGenerator.java b/base/src/org/adempiere/util/ModelClassGenerator.java
index 4bcbcc6a7f..2792838cfc 100644
--- a/base/src/org/adempiere/util/ModelClassGenerator.java
+++ b/base/src/org/adempiere/util/ModelClassGenerator.java
@@ -276,10 +276,7 @@ public class ModelClassGenerator
 			+ " c.Name, c.Description, c.ColumnSQL, c.IsEncrypted, c.IsKey, c.IsIdentifier "  // 13..18
 			+ "FROM AD_Column c "
 			+ "WHERE c.AD_Table_ID=?"
-			+ " AND c.ColumnName <> 'AD_Client_ID'"
-			+ " AND c.ColumnName <> 'AD_Org_ID'"
-			+ " AND c.ColumnName <> 'IsActive'"
-			+ " AND c.ColumnName NOT IN ('Created', 'CreatedBy', 'Updated', 'UpdatedBy')"
+			+ " AND c.ColumnName NOT IN ('AD_Client_ID', 'AD_Org_ID', 'IsActive', 'Created', 'CreatedBy', 'Updated', 'UpdatedBy')"
 			+ " AND c.IsActive='Y'"
 			+ " ORDER BY c.ColumnName";
 		boolean isKeyNamePairCreated = false; // true if the method "getKeyNamePair" is already generated