follow-up for the recent big refactoring