Possible fix for CreateFakeClient spam