JDF-59 Resolve issue with array handling