Is this change needed for all field types?