Fix logic for client scope