bug-fix: fix patch errs