Fixed ui-flow for beta.