diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java b/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java
index 11862d0340..30c7bab2ca 100644
--- a/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java
+++ b/org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java
@@ -368,7 +368,7 @@ public abstract class AbstractElementHandler implements ElementHandler {
      */
     protected boolean isProcessElement(Properties ctx, String entityType) {
     	if ("D".equals(entityType) || "C".equals(entityType)) {
-    		return "true".equalsIgnoreCase(getUpdateMode(ctx));
+    		return "Y".equalsIgnoreCase(getUpdateMode(ctx));
     	} else {
     		return true;
     	}
diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java
index 1010ac81c9..500f64a986 100644
--- a/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java
+++ b/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java
@@ -191,9 +191,9 @@ public class PackInHandler extends DefaultHandler {
 				packageInst.saveEx();
 			}
 
-			m_ctx.ctx.put("AD_Package_Imp_ID", String.valueOf(AD_Package_Imp_ID));
-			m_ctx.ctx.put("UpdateMode", m_updateDictionary);
-			m_ctx.ctx.put("PackageDirectory", packageDirectory);
+			Env.setContext(m_ctx.ctx, "AD_Package_Imp_ID", String.valueOf(AD_Package_Imp_ID));
+			Env.setContext(m_ctx.ctx, "UpdateMode", m_updateDictionary);
+			Env.setContext(m_ctx.ctx, "PackageDirectory", packageDirectory);
 			m_ctx.packIn = packIn;
 		} else {
 			Element e = new Element(uri, localName, qName, new AttributesImpl(atts));