This fixes a bug introduced by e8630e69. Fixes CID#1453292. (cherry picked from commit 7f1238bd) (cherry picked from commit 218117da) (cherry picked from commit 5c86f9e0)