Session controller fix