Fixes bugs with billing & shippingAddress new logic.  Updated Version
3.3.009.012