Fix saving non-supported fields