diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/PoFiller.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PoFiller.java
index 96a31d0d4c..30c29b10f8 100644
--- a/org.adempiere.pipo/src/org/adempiere/pipo2/PoFiller.java
+++ b/org.adempiere.pipo/src/org/adempiere/pipo2/PoFiller.java
@@ -226,7 +226,7 @@ public class PoFiller{
 					continue;
 			}
 			Element e = element.properties.get(qName);
-			if ("table".equalsIgnoreCase(e.attributes.getValue("reference"))) {
+			if (ReferenceUtils.isTableLookup(e) || ReferenceUtils.isUUIDLookup(e)) {
 				int id = setTableReference(qName);
 				if (id < 0) {
 					notFounds.add(qName);