Partial fix to session flow.