Merge pull request #2359 from dneto0/fix-warn

Avoid spurious warning about uninit var