diff --git a/src/Generator.Tests/AST/TestAST.cs b/src/Generator.Tests/AST/TestAST.cs
index a2b62500..ddc9b518 100644
--- a/src/Generator.Tests/AST/TestAST.cs
+++ b/src/Generator.Tests/AST/TestAST.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using CppSharp.Generators.CSharp;
 using System;
 using CppSharp.Generators;
+using CppSharp.Parser;
 
 namespace CppSharp.Generator.Tests.AST
 {
@@ -314,10 +315,11 @@ namespace CppSharp.Generator.Tests.AST
         [Test]
         public void TestAmbiguity()
         {
-            var bindingContext = new BindingContext(new TextDiagnosticPrinter(), new DriverOptions());
+            var bindingContext = new BindingContext(new TextDiagnosticPrinter(), new DriverOptions(),
+                new ParserOptions2())
             new CleanUnitPass { Context = bindingContext }.VisitLibrary(AstContext);
             new CheckAmbiguousFunctions { Context = bindingContext }.VisitLibrary(AstContext);
-            Assert.IsTrue(AstContext.FindClass("HasAmbiguousFunctions").Single().FindMethod("ambiguous").IsAmbiguous);            
+            Assert.IsTrue(AstContext.FindClass("HasAmbiguousFunctions").Single().FindMethod("ambiguous").IsAmbiguous);
         }
 
         [Test]
diff --git a/src/Generator/BindingContext.cs b/src/Generator/BindingContext.cs
index bba50e9c..4c060f02 100644
--- a/src/Generator/BindingContext.cs
+++ b/src/Generator/BindingContext.cs
@@ -26,10 +26,12 @@ namespace CppSharp.Generators
 
         private static readonly Dictionary<string, string> libraryMappings = new Dictionary<string, string>();
 
-        public BindingContext(IDiagnostics diagnostics, DriverOptions options)
+        public BindingContext(IDiagnostics diagnostics, DriverOptions options,
+            ParserOptions2 parserOptions = null)
         {
             Options = options;
             Diagnostics = diagnostics;
+            ParserOptions = parserOptions;
 
             Symbols = new SymbolContext();
             Delegates = new Dictionary<Function, DelegatesPass.DelegateDefinition>();
diff --git a/src/Generator/Driver.cs b/src/Generator/Driver.cs
index bf40b74f..98aadc25 100644
--- a/src/Generator/Driver.cs
+++ b/src/Generator/Driver.cs
@@ -78,8 +78,7 @@ namespace CppSharp
         {
             ValidateOptions();
             SetupIncludes();
-            Context = new BindingContext(Diagnostics, Options);
-            Context.ParserOptions = ParserOptions;
+            Context = new BindingContext(Diagnostics, Options, ParserOptions);
             Generator = CreateGeneratorFromKind(Options.GeneratorKind);
         }