Have to disable on submission_status too