I think I've solved the crash issues that occurred on map change