fix the data structure about data