fix client/server interaction