Fix order of stream