Fixes refactoring problem