Still fix the session bug.