Fixed selected item bug