Fix session helper