Fixed infinite loop on clients