Fixed flow bug