case selection fix