GH21: Session does not work properly

Prevent code loose.