Make sure to reset correct flow