Fixed refactoring.