correct some stupid refactoring mistakes