fixed session issue
Merge branch 'hotfix/sessions-helper'