Corrected error due to missing a change from the previous refactoring.