Client scope fix