simplify the patch except calling order of NOPREF