diff --git a/classes/Carrier.php b/classes/Carrier.php
index 8a352cdc8..b5e2dd193 100644
--- a/classes/Carrier.php
+++ b/classes/Carrier.php
@@ -942,7 +942,7 @@ class CarrierCore extends ObjectModel
 		if (!Validate::isInt($id_tax_rules_group))
 			die(Tools::displayError());
 		
-		if (Context::getContext()->shop->getContextType() != Shop::CONTEXT_SHOP)
+		if (Shop::getContext() != Shop::CONTEXT_SHOP)
 			$all_shops = true;
 		
 		$this->deleteTaxRulesGroup($all_shops);
diff --git a/classes/Product.php b/classes/Product.php
index 8af0445b9..3f2c62168 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -4057,7 +4057,7 @@ class ProductCore extends ObjectModel
 			die(Tools::displayError());
 		$this->deleteTaxRulesGroup($all_shops);
 
-		if (Context::getContext()->shop->getContextType() != Shop::CONTEXT_SHOP)
+		if (Shop::getContext() != Shop::CONTEXT_SHOP)
 			$all_shops = true;
 			
 		if ($all_shops)