Fixing session calls