Maybe we should explicitly end the session here?