Fix problem on OSX due to refactoring.