Oops, missed one instance of that last off-by-one...