Fix data flow