Stage flow fix