Issue 447

This fixes the bug and removes session name that isn't used anywhere.