Fixed FlowControl to reflect Riese's refactoring