Index: /controller/wpsg_BasketController.class.php
===================================================================
--- /controller/wpsg_BasketController.class.php	(revision 7031)
+++ /controller/wpsg_BasketController.class.php	(revision 7032)
@@ -267,5 +267,15 @@
 			$this->shop->checkShippingAvailable();
 			$this->shop->checkPaymentAvailable();
-						
+
+            if (!in_array($_SESSION['wpsg']['checkout']['shipping'], array_keys($this->shop->arShipping)) || !in_array($_SESSION['wpsg']['checkout']['payment'], array_keys($this->shop->arPayment))) {
+
+                if (!in_array($_SESSION['wpsg']['checkout']['shipping'], array_keys($this->shop->arShipping))) $_SESSION['wpsg']['checkout']['shipping'] = array_keys($this->shop->arShipping)[0];
+                if (!in_array($_SESSION['wpsg']['checkout']['payment'], array_keys($this->shop->arPayment))) $_SESSION['wpsg']['checkout']['payment'] = array_keys($this->shop->arPayment)[0];
+
+                $this->shop->basket->initFromSession(true);
+                $this->shop->view['basket'] = $this->shop->basket->toArray();
+
+            }
+			
 			$this->shop->view['arShipping'] = $this->shop->arShipping;
 			$this->shop->view['arPayment'] = $this->shop->arPayment;
Index: /views/mods/mod_paypalapi/checkout_handlePayment.phtml
===================================================================
--- /views/mods/mod_paypalapi/checkout_handlePayment.phtml	(revision 7031)
+++ /views/mods/mod_paypalapi/checkout_handlePayment.phtml	(revision 7032)
@@ -72,5 +72,5 @@
 			jQuery('input[name="wpsg_checkout2"], input[name="wpsg_checkout"]').hide();
 	 
-			jQuery('.wpsg_shipping input[type="radio"]').bind('change', function() {
+			jQuery('.shippay_item_wrap input[type="radio"]').bind('change', function() {
 	
 				if (jQuery(this).val() != wpsg_mod_paypalapi_shipping_id)