Fix currentItem bug in conversion