fix data issues