Refactoring: Fixed refactoring change