Fix an error introduced due to refactoring