Fixed the result of reckless refactoring