cid #11309 follow-up