fix data structure