Fixing bug in TenantObserver