fix fields save