Fix infinite loop from Client