Fixing refactoring