Re-fixing coverity 18135