fix steps ordering for streams