fixed the "flow"