Port fix for Coverity bug #41 from 1.1.x