(Following) Fixed bad merge where copying tenants was lost