#266 change saving right fields a bit