fix client/server