June 17th fix session helper