Fixing session assignment