fix data too