Fixed bug with data header