Fix selection strategy