CLWPF-25 : Fix save issues between server and client