Fixing client/server