Fix put_fields without mapping