Minor fix to previous refactoring