agreed. That's how I implemented it. Though I haven't yet tested the regular flow