[#84] Fix moveToNext