Really fix the bug Coverity found earlier...