I can now longer repro this, I recall changing a lot of the flow here a few months ago, flag to reopen if still an issue.