Map switch fix