diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 42f7093a4..6d0745645 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -43,6 +43,7 @@
  - fixed: WebGUI Password Recovery email subject hard-coded
  - rfe: Add url to list of attributes tracked in assetHistory
  - fixed: Article now only allows 2 files to be uploaded
+ - fixed: DataForms can now export all non-default fields
 
 7.5.22
  - fixed: Layout template now gets prepared correctly
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index af049e7c9..0ca64abad 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -1219,7 +1219,7 @@ sub www_exportTab {
         my @exportRows;
         my $entries = $self->session->db->read("select * from DataForm_entry where assetId=?", [$self->getId]);
         my @exportFields;
-        for my $field ( map { $self->getFieldConfig($_) } $self->getFieldOrder ) {
+        for my $field ( map { $self->getFieldConfig($_) } @{$self->getFieldOrder} ) {
             next
                 if $field->{isMailField} && !$self->get('mailData');
             push @exportFields, $field->{name};