fix skipping existing fields