going back flow bug fix