HOTFIX: Cleaned session handling