GH21: Session does not work properly

Reviewed and approved.