solve bug on clients