fix session error
Merge branch 'temp1'