fixed switcher map