Fix: Double Shipping & Version Updated

Fix: Double Shipping
Fix: Version Updated