fixed session expiration issues for special cases