Fix next_item_in_track helper