Fixing session issue