Fix client/server side