Data format fix