Another try to fix coverity_scan...