It would be better to use 'arg.property' to test for these fields, rather than the derived fieldName strings.