Fixing data stream, hopefully.