Better session handling - make sure and use the correct session