fix fieldmap saving