Bugfix session handling implementation