Fixed an issue with type changes causing map issue.
Merge pull request #1807 from ComicIronic/NuTaxi

Fixed an issue with type changes causing map issue.