Fixed stupid refactoring bug