Item selection fix