Bug from previous refactoring correction