Custom field values save fix