Fix/2.7/rb6056

A recent refactoring of SpreadAndWait introduced a bug in the
next method.