diff --git a/Modules/HeaderDoc/HeaderElement.pm b/Modules/HeaderDoc/HeaderElement.pm
index a43d411..6279f4c 100644
--- a/Modules/HeaderDoc/HeaderElement.pm
+++ b/Modules/HeaderDoc/HeaderElement.pm
@@ -9568,10 +9568,19 @@ sub processAppleScriptFunctionContents
 
     # Determine the output mode.
     my $xml_output = 0;
-    my $apiowner = $self->apiOwner();
-    if ($apiowner->outputformat() eq "hdxml") { $xml_output = 1; }
+    my $apiOwner = $self->apiOwner();
+    if ($apiOwner->outputformat() eq "hdxml") { $xml_output = 1; }
+
+    my $apioclass = ref($apiOwner) || $apiOwner;
+
+    if ($apioclass =~ /HeaderDoc::Header/) {
+	$class_self->{HEADEROBJECT} = $apiOwner;
+    } else {
+	$class_self->{HEADEROBJECT} = $apiOwner->{HEADEROBJECT};
+    }
+
 
-    print STDERR "OF: ".$apiowner->outputformat()."\n" if ($localDebug);
+    print STDERR "OF: ".$apiOwner->outputformat()."\n" if ($localDebug);
 
     # Obtain the parse tree.
     my $ptref = $class_self->{PARSETREE};