Tenant unloading issue with tasks Fix