Fixed a StackOverflowException in Client oops