HUGO: Fix CID 1003199-1003200, better fix of CID 1003197-1003198