follow up to review #2558