Fix Flow Scope to singleton