Fix unified save