Dai - fix flow data