removed switchsession hack