Improved handling of wrapped and un-wrapped field data