workaround on payment fix 2