Refs #209: Addresses issues with custom fields