a fix after last year's refactoring