diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6484a7147..a4611dfab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.6)
 project(rtags)
 set(RTAGS_VERSION_MAJOR 2)
 set(RTAGS_VERSION_MINOR 5)
-set(RTAGS_VERSION_DATABASE 108)
+set(RTAGS_VERSION_DATABASE 109)
 set(RTAGS_VERSION_SOURCES_FILE 7)
 set(RTAGS_VERSION ${RTAGS_VERSION_MAJOR}.${RTAGS_VERSION_MINOR}.${RTAGS_VERSION_DATABASE})
 
diff --git a/src/ClangIndexer.cpp b/src/ClangIndexer.cpp
index 58b1d626f..c08ebcf0f 100644
--- a/src/ClangIndexer.cpp
+++ b/src/ClangIndexer.cpp
@@ -1120,7 +1120,7 @@ bool ClangIndexer::handleReference(const CXCursor &cursor, CXCursorKind kind, Lo
             *cursorPtr = 0;
         return false;
     }
-    setType(*c, clang_getCursorType(cursor));
+    setType(*c, clang_getCursorType(kind == CXCursor_MemberRefExpr ? ref : cursor));
     if (RTags::isFunction(refKind)) {
         mLastCallExprSymbol = c;
     }