Attempt to fix the bug which causes the map to crash
Merge remote-tracking branch 'origin/master' into andreas