HOTFIX: Use session id