correctly deal with the end of the draft