Fix selection for single