Fixed bug introduced by refactoring.