diff --git a/src/template/incremental/Notification.tt b/src/template/incremental/Notification.tt
index 480c4c9ff0c7e612010c2156863f1c619e9da330..ef4359c97ad9f46ddf83a7689fb1b0c48ef53384 100644
--- a/src/template/incremental/Notification.tt
+++ b/src/template/incremental/Notification.tt
@@ -234,9 +234,7 @@ $endif
   #resetVisit
   #resetCache
   #(signature)_handler.notifyDependencies();
-  $if (TraceFlush)
-  $HostClass.this.state().trace().flushIncAttr($HostClass.this, "#signature", "", "");
-  $endif
+  $include(AttrDecl.traceFlushIncAttr)
 }
 $endif
 $endif
diff --git a/src/template/trace/TraceHooks.tt b/src/template/trace/TraceHooks.tt
index b07e1673c609cb57e7af291fc91312f8bebdb82d..143e31d5ff559c0f3c74759291ba763ab05cefb2 100644
--- a/src/template/trace/TraceHooks.tt
+++ b/src/template/trace/TraceHooks.tt
@@ -323,6 +323,12 @@ state().trace().flushAttr("#getAspectName", this, "#hostClassName.#signatureJava
 $endif
 ]]
 
+AttrDecl.traceFlushIncAttr [[
+$if (TraceFlush)
+state().trace().flushIncAttr("#getAspectName", fNode, fAttrID, "", "");
+$endif
+]]
+
 CollEq.traceContributionCheckBegin [[
 $if (TraceColl)
 state().trace().contributionCheckBegin("#getAspectName", this, "#collectionId", "#escapeConditionForTemplate");