Attempt to fix the bug which causes the map to crash