fix session conflict