Probably safer here to use the field wrappers?