diff --git a/src/QUI/ERP/Shipping/EventHandler.php b/src/QUI/ERP/Shipping/EventHandler.php
index 62344139aca76732608df979b8ea867add8f24b7..b615467e39b20348dd87ba02f0036ec483c4e419 100644
--- a/src/QUI/ERP/Shipping/EventHandler.php
+++ b/src/QUI/ERP/Shipping/EventHandler.php
@@ -100,8 +100,6 @@ public static function onQuiqqerOrderBasketToOrderEnd(
             return;
         }
 
-        $Shipping->setOrder($Order);
-
         $PriceFactors = $Products->getPriceFactors();
         $PriceFactors->addToEnd($Shipping->toPriceFactor());
 
diff --git a/src/QUI/ERP/Shipping/Rules/ShippingRule.php b/src/QUI/ERP/Shipping/Rules/ShippingRule.php
index c5776a522aba5076becb1fb4fdb2adbf9c9e984d..54293cda9d7ddfb0f5a2612a870feefeb633e54f 100644
--- a/src/QUI/ERP/Shipping/Rules/ShippingRule.php
+++ b/src/QUI/ERP/Shipping/Rules/ShippingRule.php
@@ -335,7 +335,7 @@ public function canUsedInOrder($Order)
         $articleList = $Articles->getArticles();
 
         $articles    = $this->getAttribute('articles');
-        $articleOnly = $this->getAttribute('articles_only');
+        $articleOnly = (int)$this->getAttribute('articles_only');
         $unitTerms   = $this->getUnitTerms();
 
         $quantityFrom  = $this->getAttribute('purchase_quantity_from');     // Einkaufsmenge ab
@@ -362,6 +362,8 @@ public function canUsedInOrder($Order)
             }
 
             $articles = \array_flip($articles);
+        } else {
+            $articleOnly = 0;
         }
 
         foreach ($articleList as $Article) {
@@ -417,7 +419,6 @@ public function canUsedInOrder($Order)
             }
         }
 
-
         if ($articleFound && $articleOnly && \count($articleList) !== 1) {
             QUI\ERP\Shipping\Debug::addLog(
                 "{$this->getTitle()} :: is not a single article"
diff --git a/src/QUI/ERP/Shipping/Types/ShippingEntry.php b/src/QUI/ERP/Shipping/Types/ShippingEntry.php
index beb17969352cef67211ed7c0bc710dbbda1c0607..e41bafdcdca4e55f87a86ebeea2698bde3fd937e 100644
--- a/src/QUI/ERP/Shipping/Types/ShippingEntry.php
+++ b/src/QUI/ERP/Shipping/Types/ShippingEntry.php
@@ -591,7 +591,7 @@ public function getShippingRules()
 
             if (!$Rule->canUsedInOrder($this->Order)) {
                 if ($debugging) {
-                    Debug::addLog("### {$Rule->getTitle()} can not use in order");
+                    Debug::addLog("### {$Rule->getTitle()} can not used in order");
 
                     $debuggingLog[] = [
                         'id'     => $Rule->getId(),
@@ -601,13 +601,13 @@ public function getShippingRules()
                     ];
                 }
 
-                if ($debugging) {
-                    Debug::addLog("### {$Rule->getTitle()} can use in order");
-                }
-
                 continue;
             }
 
+            if ($debugging) {
+                Debug::addLog("### {$Rule->getTitle()} can used in order");
+            }
+
             $result[] = $Rule;
 
             if ($debugging) {