client scope fix