Coverity attempt 2