diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateField.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateField.java
index cdf48dfb5db..5c3a1e3f4f1 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateField.java
+++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateField.java
@@ -40,7 +40,7 @@ public class QuickFixCreateField extends AbstractAstRewriteQuickFix {
 		CxxAstUtils utils = CxxAstUtils.getInstance();
 		try {
 			IASTTranslationUnit ast = getTranslationUnitViaEditor(marker)
-					.getAST(null, ITranslationUnit.AST_SKIP_INDEXED_HEADERS);
+					.getAST(index, ITranslationUnit.AST_SKIP_INDEXED_HEADERS);
 			IASTName astName = getASTNameFromMarker(marker, ast);
 			if (astName == null) {
 				return;
diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/CxxAstUtils.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/CxxAstUtils.java
index 4371c739f30..1521fb66ca4 100644
--- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/CxxAstUtils.java
+++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/CxxAstUtils.java
@@ -385,7 +385,7 @@ public final class CxxAstUtils {
 					for (IIndexName decl : declarations) {
 
 						ITranslationUnit tu = getTranslationUnitFromIndexName(decl);
-						IASTNode node = tu.getAST(null,
+						IASTNode node = tu.getAST(index,
 								ITranslationUnit.AST_SKIP_INDEXED_HEADERS)
 								.getNodeSelector(null).findEnclosingNode(
 										decl.getNodeOffset(),