Issue #6: Fixed a bug that session