hotfix session handling