Application flow fix