Fix current-item bug