Port fix for Coverity bug #23 from 1.1.x