diff --git a/master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/DeliveryLineSetZeroPriceAndOrUpdateAppliedRule.xml b/master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/DeliveryLineSetZeroPriceAndOrUpdateAppliedRule.xml
index 5c34a9bdebb2f4f2077eb6d754208f3ac9f3352b..dafbb6c452fd7e66ae4d3e43720293e07b1e0558 100644
--- a/master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/DeliveryLineSetZeroPriceAndOrUpdateAppliedRule.xml
+++ b/master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/DeliveryLineSetZeroPriceAndOrUpdateAppliedRule.xml
@@ -51,11 +51,12 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>assert( context.getPortalType() in context.getPortalDeliveryMovementTypeList() )\n
-if context.getSimulationState() == \'cancelled\':\n
-  return\n
-price = context.getPrice()\n
 context.setPrice(0.0)\n
-context.setQuantity(1.0)\n
+if context.getSimulationState() == \'cancelled\':\n
+  # force no simulation\n
+  context.setQuantity(0.0)\n
+else:\n
+  context.setQuantity(1.0)\n
 context.getParentValue().Delivery_updateAppliedRule()\n
 </string> </value>
         </item>
diff --git a/master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/SaleOrderLine_setPriceToZeroAndOrUpdateAppliedRule.xml b/master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/SaleOrderLine_setPriceToZeroAndOrUpdateAppliedRule.xml
index bdc8e80a8f964448919317ad53aed1a9c46040dc..4fd7317f1fb2a792e5779b4e4c71b2157f482860 100644
--- a/master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/SaleOrderLine_setPriceToZeroAndOrUpdateAppliedRule.xml
+++ b/master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/SaleOrderLine_setPriceToZeroAndOrUpdateAppliedRule.xml
@@ -52,7 +52,6 @@
             <key> <string>_body</string> </key>
             <value> <string>if context.getPortalType() != \'Sale Order Line\':\n
   raise ValueError(\'%s is not sale order line\' % context.getPath())\n
-price = context.getPrice()\n
 context.setPrice(0.0)\n
 context.setQuantity(1.0)\n
 context.getParentValue().Delivery_updateAppliedRule()\n
diff --git a/master/bt5/vifib_upgrader/bt/revision b/master/bt5/vifib_upgrader/bt/revision
index 3e932fe8f188bb6dbcb02afe1306fa6e0b90357b..597975b413303a8c3cb711640e290794dc8077a8 100644
--- a/master/bt5/vifib_upgrader/bt/revision
+++ b/master/bt5/vifib_upgrader/bt/revision
@@ -1 +1 @@
-34
\ No newline at end of file
+35
\ No newline at end of file