fix keep the same os error in reinstall
Merge branch 'master' into refactor