Properly set current index