Fix an issue found by Coverity Scan introduced by a commit for bug #657808