Added to the todo on next() and brought up a future `issue`