Fixed latest refactoring.