Small fix associated with recent refactoring