fixed payment address on return to first step and change shipping method