Fix selection management