Fixing refactoring...