fix session for real!