diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index edf51ca..c6147ef 100644
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -736,11 +736,11 @@
     QualType Type = Ex->getType();
 
     if (const RecordType *Record = Type->getAs<RecordType>()) {
-      // FIXME: Inherited conversion functions!
       llvm::SmallVector<CXXConversionDecl *, 4> ObjectPtrConversions;
+      CXXRecordDecl *RD = cast<CXXRecordDecl>(Record->getDecl());
+      OverloadedFunctionDecl *Conversions = 
+        RD->getVisibleConversionFunctions(Context, RD);
       
-      OverloadedFunctionDecl *Conversions
-        = cast<CXXRecordDecl>(Record->getDecl())->getConversionFunctions();
       for (OverloadedFunctionDecl::function_iterator
              Func = Conversions->function_begin(),
              FuncEnd = Conversions->function_end();