MAP-964: switch logic