Fix selection problem