state selector fix