About to fix flow graph