fix client, server