Fix switchBaseMap methods