hotfix for session bug