Fix bug where current item would be incorrect