client server fix_2