Fix session issue