fix on patch: not to use session