diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java b/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java
index 246975a92b..adaba59b51 100644
--- a/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java
+++ b/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java
@@ -489,7 +489,7 @@ public abstract class AbstractElementHandler implements ElementHandler {
     	if (element.properties.containsKey(uuidColumn)) {
     		uuid = element.properties.get(uuidColumn).contents.toString();
     	}
-    	return (uuid != null && uuid.trim().length() == 36);
+    	return (uuid != null && uuid.trim().length() <= 36);
     }
 
     protected String getUUIDKey(PIPOContext ctx, Element element) {
@@ -497,7 +497,7 @@ public abstract class AbstractElementHandler implements ElementHandler {
     	String uuidColumn = PO.getUUIDColumnName(tableName);
     	if (element.properties.containsKey(uuidColumn)) {
     		String uuid = element.properties.get(uuidColumn).contents.toString();
-    		if (uuid != null && uuid.trim().length() == 36)
+    		if (uuid != null && uuid.trim().length() <= 36)
     			return uuid.trim();
     	}
     	return null;
diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/POFinder.java b/org.adempiere.pipo/src/org/adempiere/pipo2/POFinder.java
index a1d7e52a3e..9827ef1ef4 100644
--- a/org.adempiere.pipo/src/org/adempiere/pipo2/POFinder.java
+++ b/org.adempiere.pipo/src/org/adempiere/pipo2/POFinder.java
@@ -82,7 +82,7 @@ public class POFinder {
     	String idColumn = tableName + "_ID";
     	if (element.properties.containsKey(uuidColumn)) {
     		String uuid = element.properties.get(uuidColumn).contents.toString();
-    		if (uuid != null && uuid.trim().length() == 36) {
+    		if (uuid != null && uuid.trim().length() <= 36) {
     			uuid = uuid.trim();
     			String targetUUID = Env.getAD_Client_ID(ctx.ctx) > 0 ? getTargetUUID(ctx.ctx, tableName, uuid, ctx.trx.getTrxName()) : uuid; 
     			Query query = new Query(ctx.ctx, tableName, uuidColumn+"=?", getTrxName(ctx));