Added a fix to allow null nonSummaryFields