fixed issue on token expiration