fix data construction