Fixed FakeClient