fixed some selection