client & server fix