resolve in session bug [Finishes #77772078]