fix data mapping