Fixed problem caused by refactoring