diff --git a/src/Analysis/Engine/Impl/Values/BoundMethodInfo.cs b/src/Analysis/Engine/Impl/Values/BoundMethodInfo.cs
index 8b631301d..4285efce4 100644
--- a/src/Analysis/Engine/Impl/Values/BoundMethodInfo.cs
+++ b/src/Analysis/Engine/Impl/Values/BoundMethodInfo.cs
@@ -46,6 +46,7 @@ public override IAnalysisSet Call(Node node, AnalysisUnit unit, IAnalysisSet[] a
         public override IPythonProjectEntry DeclaringModule => Function.DeclaringModule;
         public override int DeclaringVersion => Function.DeclaringVersion;
         public override IEnumerable<ILocationInfo> Locations => Function.Locations;
+        public override BuiltinTypeId TypeId => BuiltinTypeId.Function; 
 
         public IEnumerable<KeyValuePair<string, string>> GetRichDescription() {
             if (Push()) {
diff --git a/src/Analysis/Engine/Impl/Values/BuiltinMethodInfo.cs b/src/Analysis/Engine/Impl/Values/BuiltinMethodInfo.cs
index cb3ffe7fc..058bf578c 100644
--- a/src/Analysis/Engine/Impl/Values/BuiltinMethodInfo.cs
+++ b/src/Analysis/Engine/Impl/Values/BuiltinMethodInfo.cs
@@ -98,7 +98,7 @@ public override string Documentation {
                 return _doc;
             }
         }
-
+        public override BuiltinTypeId TypeId => BuiltinTypeId.BuiltinFunction;
         public override PythonMemberType MemberType => _memberType;
         public override string Name => _function.Name;
         public override ILocatedMember GetLocatedMember() => _function as ILocatedMember;
diff --git a/src/Analysis/Engine/Test/AnalysisTest.cs b/src/Analysis/Engine/Test/AnalysisTest.cs
index 44fe4b5e6..b338e579c 100644
--- a/src/Analysis/Engine/Test/AnalysisTest.cs
+++ b/src/Analysis/Engine/Test/AnalysisTest.cs
@@ -2425,7 +2425,9 @@ def __invert__(self):
 
 
         [TestMethod, Priority(0)]
-        public async Task TrueDividePython3X() {
+        [DataRow(PythonLanguageVersion.V35)]
+        [DataRow(PythonLanguageVersion.V36)]
+        public async Task TrueDividePython3X(PythonLanguageVersion version) {
             var text = @"
 class C:
     def __truediv__(self, other):
@@ -2438,7 +2440,7 @@ def __rtruediv__(self, other):
 c = 'abc' / a
 ";
 
-            using (var server = await CreateServerAsync(PythonVersions.Required_Python35X)) {
+            using (var server = await CreateServerAsync(PythonVersions.GetRequiredCPythonConfiguration(version))) {
                 var analysis = await server.OpenDefaultDocumentAndGetAnalysisAsync(text);
                 analysis.Should().HaveVariable("b").OfType(BuiltinTypeId.Int)
                     .And.HaveVariable("c").OfType(BuiltinTypeId.Float);
diff --git a/src/Analysis/Engine/Test/InheritanceTests.cs b/src/Analysis/Engine/Test/InheritanceTests.cs
index 3eece791e..2f0dab6ec 100644
--- a/src/Analysis/Engine/Test/InheritanceTests.cs
+++ b/src/Analysis/Engine/Test/InheritanceTests.cs
@@ -36,7 +36,7 @@ def virt():
             using (var server = await new Server().InitializeAsync(PythonVersions.Required_Python36X)) {
                 var analysis = await server.OpenDefaultDocumentAndGetAnalysisAsync(code);
 
-                analysis.Should().HaveVariable("b").OfType(BuiltinTypeId.Int);
+                analysis.Should().HaveVariable("b").OfTypes(BuiltinTypeId.Int);
             }
         }
 
@@ -61,7 +61,7 @@ def virt():
             using (var server = await new Server().InitializeAsync(PythonVersions.Required_Python36X)) {
                 var analysis = await server.OpenDefaultDocumentAndGetAnalysisAsync(code);
 
-                analysis.Should().HaveVariable("b").OfType(BuiltinTypeId.Int);
+                analysis.Should().HaveVariable("b").OfTypes(BuiltinTypeId.Int, BuiltinTypeId.Function);
             }
         }
     }