-Fix on App Flow