fixed scope on_or_after to be only after