return flow fix