Loading / Unloading map fix

Loading / Unloading map fix