Possible workaround for "shipping/payment policy" required errors

Please give this version a try: