Bug fix session handling #2