server and client fix