// follow up #2265