Fix bug with recent refactoring.