diff --git a/shared/cplusplus/AST.cpp b/shared/cplusplus/AST.cpp
index f894a16167a5b2a88cf74b9858db8a598e0e00d3..911ba399ed837bc007cca1fbd9552f15f845f157 100644
--- a/shared/cplusplus/AST.cpp
+++ b/shared/cplusplus/AST.cpp
@@ -1675,9 +1675,10 @@ unsigned MemberAccessAST::firstToken() const
 
 unsigned MemberAccessAST::lastToken() const
 {
-    assert(0 && "review me");
     if (member_name)
         return member_name->lastToken();
+    else if (template_token)
+        return template_token + 1;
     return access_token + 1;
 }