Fixed map unload issue causing crash in FireFox