Final Fix  for Flow Calculation.