Fix cilly bug with map reloading