Fix for refactoring.