cid #11125/#11126 fixed