fixed nextUpdate and until behaviour in the non-strict case