session abstraction fix