FIX behaviour on tenant access