Fix issue with refactoring.