fix billing and shipping address parameters