Fix buffered nexts getting resent after completion