Fixed the flow