Initial fix to stop automatic datastream ordering.