Fixed an issue with the latest refactoring.