Edit Framework flow fix