workaround on payment fix