Fixed bug in parsing out the tenants