Fixed, Clean down-stream dataflow