Index: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php	(revision 22430)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php	(revision 22431)
@@ -481,8 +481,8 @@
             $objFormParam->setParam($arrShippingTemp[1]);
         } else {
-            if (empty($arrShippingTemp[1])) {
+            if ($arrOrderTemp['deliv_check'] == 1) {
+                $objFormParam->setParam($arrShippingTemp[1]);
+            } else {
                 $objFormParam->setParam($arrShippingTemp[0]);
-            } else {
-                $objFormParam->setParam($arrShippingTemp[1]);
             }
         }