Fixing a session token issue