More sensible use of currentItem and hopefully fixing a but where it would send out offset metadata