diff --git a/org.adempiere.base/src/org/compiere/model/MPackage.java b/org.adempiere.base/src/org/compiere/model/MPackage.java
index 18076db9f7..2e769b9483 100644
--- a/org.adempiere.base/src/org/compiere/model/MPackage.java
+++ b/org.adempiere.base/src/org/compiere/model/MPackage.java
@@ -241,9 +241,12 @@ public class MPackage extends X_M_Package
 		
 		if (getBoxCount() > 0 && getBoxCount() - packageMPSCount > 0)
 		{
-			MPackageMPS packageMPS = new MPackageMPS(getCtx(), 0, get_TrxName());
-			packageMPS.setM_Package_ID(getM_Package_ID());
-			packageMPS.saveEx();
+			for (int i = 0; i < getBoxCount() - packageMPSCount; i++)
+			{
+				MPackageMPS packageMPS = new MPackageMPS(getCtx(), 0, get_TrxName());
+				packageMPS.setM_Package_ID(getM_Package_ID());
+				packageMPS.saveEx();
+			}
 		}
 		
 		return success;
diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ADLookup.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ADLookup.java
index c95f229e08..033641b08f 100644
--- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ADLookup.java
+++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ADLookup.java
@@ -100,7 +100,7 @@ public class ADLookup {
 		if (isUUID(text))
 		{
 			sql.append("SELECT ").append(m_keyColumnName).append(" FROM ").append(m_tableName)
-			   .append(" WHERE ").append(m_tableName).append("_UU=").append(DB.TO_STRING(text));
+			   .append(" WHERE ").append(m_tableName).append("_UU=").append(DB.TO_STRING(text.toLowerCase()));
 		}
 		else if (m_columnName.equals("M_Product_ID"))
 		{