diff --git a/org.adempiere.base/src/org/compiere/util/Env.java b/org.adempiere.base/src/org/compiere/util/Env.java
index dcc4c73031..5d61f14c86 100644
--- a/org.adempiere.base/src/org/compiere/util/Env.java
+++ b/org.adempiere.base/src/org/compiere/util/Env.java
@@ -1582,7 +1582,7 @@ public final class Env
 					String foreignTable = colToken.getReferenceTableName();
 					if (v != null) {
 						if (format != null && format.length() > 0) {
-							if (v instanceof Integer && (Integer) v > 0 && token.endsWith("_ID")) {
+							if (v instanceof Integer && (Integer) v > 0 && !Util.isEmpty(foreignTable)) {
 								int tblIndex = format.indexOf(".");
 								String tableName = null;
 								if (tblIndex > 0)