Handle selection fix