diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTCompletionNode.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTCompletionNode.java
index 3e56727e81b..54e7730faee 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTCompletionNode.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTCompletionNode.java
@@ -33,6 +33,9 @@ public class ASTCompletionNode {
 	
 	private IASTTranslationUnit translationUnit;
 
+	// used for debug
+	public int count;
+	
 	/**
 	 * Only constructor.
 	 * 
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/InternalASTServiceProvider.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/InternalASTServiceProvider.java
index cf1f4139310..16188fa1f70 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/InternalASTServiceProvider.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/InternalASTServiceProvider.java
@@ -212,7 +212,10 @@ public class InternalASTServiceProvider implements IASTServiceProvider {
 		
 		// Run the parse and return the completion node
 		parser.parse();
-		return parser.getCompletionNode();
+		ASTCompletionNode node = parser.getCompletionNode();
+		if (node != null)
+			node.count = scanner.getCount();
+		return node;
 	}
 	
     /*
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java
index e5739dcfa56..3e7133024e6 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java
@@ -121,12 +121,17 @@ public class CCompletionProcessor2 implements IContentAssistProcessor {
 			
 			if (CUIPlugin.getDefault().getPreferenceStore().getBoolean(ContentAssistPreference.TIME_DOM)) {
 				long propTime = System.currentTimeMillis();
-				System.out.println("Completion Parse: " + (stopTime - startTime) + " + Proposals: " //$NON-NLS-1$ //$NON-NLS-2$
+				System.out.print("Completion Parse: " + (stopTime - startTime) + " + Proposals: " //$NON-NLS-1$ //$NON-NLS-2$
 						+ (propTime - stopTime));
+				if (completionNode != null)
+					System.out.print(" - tokens: " + completionNode.count);
+				else
+					System.out.print(" - no completion node");
+				System.out.println();
 				System.out.flush();
 			}
 			
-			return propsArray; 
+			return propsArray;
 			
 		} catch (UnsupportedDialectException e) {
 			errorMessage = "Unsupported Dialect Exception";