Finally, fix the session bug.