diff --git a/shared/cplusplus/AST.cpp b/shared/cplusplus/AST.cpp
index e0f1582db6ddd59026dc79d59d859be9535a039b..911af02e53cc312dc5520f3d3080273fdaa2f65e 100644
--- a/shared/cplusplus/AST.cpp
+++ b/shared/cplusplus/AST.cpp
@@ -2772,8 +2772,13 @@ unsigned UsingDirectiveAST::firstToken() const
 
 unsigned UsingDirectiveAST::lastToken() const
 {
-    assert(0 && "review me");
-    return semicolon_token + 1;
+    if (semicolon_token)
+        return semicolon_token + 1;
+    else if (name)
+        return name->lastToken();
+    else if (namespace_token)
+        return namespace_token + 1;
+    return using_token + 1;
 }
 
 void WhileStatementAST::accept0(ASTVisitor *visitor)