Fix switching to a just-imported map