Fix tile marker crash
Merge pull request #1854 from Prototik/tile-marker-crash

Fix tile marker crash