Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 7515)
+++ /controller/wpsg_ShopController.class.php	(revision 7516)
@@ -4589,18 +4589,14 @@
 							$arShippingNew[$subKey]['name'] = implode(' + ', wpsg_trim(array_merge(array($sub['name']), (array)explode(',', $arShippingNew[$subKey]['name']))));
 							$arShippingNew[$subKey]['hint'] = implode('<br /><br />', wpsg_trim(array_merge(array($sub['hint']), (array)explode(',', $arShippingNew[$subKey]['hint']))));
-
+							
 							// w-50
 							$arPriceSub = explode('-', $sub['price']);
 							
-							if (isset($arShippingNew[$subKey]['price'])) $arShippingNew[$subKey]['price'] = $arShippingNew[$subKey]['price'] + $arPriceSub[1];
-							else if (isset($sub['price'])) $arShippingNew[$subKey]['price'] = $arPriceSub[1];
-							
-							wpsg_debug($sub);
-							
+							//if (isset($arShippingNew[$subKey]['price'])) $arShippingNew[$subKey]['price'] = $arShippingNew[$subKey]['price'] + $arPriceSub[1];
+							//else if (isset($sub['price'])) $arShippingNew[$subKey]['price'] = $arPriceSub[1];
+							 
 							//if (isset($arShippingNew[$subKey]['price'])) $arShippingNew[$subKey]['price'] = $arShippingNew[$subKey]['price'] + $sub['price'];
 							//else if (isset($sub['price'])) $arShippingNew[$subKey]['price'] = $sub['price'];
 							
-							
-
 							$arShippingNew[$subKey]['sub'][$subShipping] = $sub;
 
@@ -4616,5 +4612,5 @@
 
 				}
-
+				
 				$this->arShipping = $arShippingNew;
 				$this->bShippingMerged = true;
Index: /lib/wpsg_calculation.class.php
===================================================================
--- /lib/wpsg_calculation.class.php	(revision 7515)
+++ /lib/wpsg_calculation.class.php	(revision 7516)
@@ -343,7 +343,7 @@
          */
         public function addShipping($set, $bruttonetto, $tax_key, $shipping_key) {
-
+ 
             $tax_key = $this->normalizeTaxKey($tax_key);
-                                     
+                                
             $this->arCalculationRow['shipping'] = [
             	'type' => 'shipping',
@@ -496,5 +496,5 @@
 								
 								list($typ, $set) = explode('-', $set);
-																
+														
 							}
 							
@@ -510,5 +510,5 @@
 													
 							} else {
-																							
+																					
 								if (wpsg_isTrue($cr['data']['targetCountry'])) {
 								
@@ -532,8 +532,8 @@
 								//wpsg_Debug($brutto.":".$set_brutto);
 								// Kleiner 0 prÃŒfen
-								if (($this->arCalculation['sum']['brutto'] + $set_brutto) < 0) $set_brutto = -1 * $this->arCalculation['sum']['brutto']; 
+								if (($this->arCalculation['sum']['brutto'] + $set_brutto) < 0) $set_brutto = -1 * $this->arCalculation['sum']['brutto'];
+																
+								list($set_netto, $set_brutto) = $this->calculateTaxPart(WPSG_BRUTTO, $set_brutto, $cr['tax_key']);
 								 
-								list($set_netto, $set_brutto) = $this->calculateTaxPart(WPSG_BRUTTO, $set_brutto, $cr['tax_key']);
-								
 								//wpsg_debug('2: '.$set_netto.":".$set_brutto);
 							}
@@ -543,7 +543,7 @@
 						$netto += $set_netto;
 						$brutto += $set_brutto;
-						
+														
 					}
-	 
+						 
 					$cr['set'] = array_values($cr['set'])[0];