Fixing regression in latest refactoring.