fix tenant_id