(Buildfix) redef variable

Frickin' definitions.
Merge pull request #8156 from KA101/mapfix

(Buildfix) redef variable