#355: Applied MMlosh's patch to fix worldmap bugs