diff --git a/src/Cursor.cc b/src/Cursor.cc
index 8e03e55..e7651a4 100644
--- a/src/Cursor.cc
+++ b/src/Cursor.cc
@@ -46,16 +46,31 @@ std::string clangmm::Cursor::get_usr_extended() const {
   if(!is_valid_kind())
     return std::string();
   
-  const auto token_spelling=[](const std::string &spelling) -> std::string {
+  const auto token_spelling=[](const std::string &spelling_) -> std::string {
+    std::string spelling;
+    if(!spelling_.empty() && spelling_[0]=='~')
+      spelling=spelling_.substr(1);
+    else
+      spelling=spelling_;
     for(size_t i=0;i<spelling.size();++i) {
       if(spelling[i]=='<' || spelling[i]=='(')
         return spelling.substr(0, i);
     }
     return spelling;
   };
-  std::string usr=token_spelling(get_spelling());
-  auto cursor=get_semantic_parent();
-  Kind kind;
+  
+  auto cursor=*this;
+  auto kind=cursor.get_kind();
+  // If constructor, destructor or function template, and the token spelling is equal, set cursor to parent
+  if(kind==clangmm::Cursor::Kind::Constructor || kind==clangmm::Cursor::Kind::Destructor ||
+     kind==clangmm::Cursor::Kind::FunctionTemplate) {
+    auto parent=cursor.get_semantic_parent();
+    if(token_spelling(cursor.get_spelling())==token_spelling(parent.get_spelling()))
+    cursor=parent;
+  }
+  
+  std::string usr=token_spelling(cursor.get_spelling());
+  cursor=cursor.get_semantic_parent();
   while((kind=cursor.get_kind())!=Kind::TranslationUnit && cursor.is_valid_kind()) {
     if(kind==Kind::CXXMethod || kind==Kind::FunctionDecl || kind==Kind::FunctionTemplate ||
        kind==Kind::Constructor || kind==Kind::Destructor) {
diff --git a/src/Tokens.cc b/src/Tokens.cc
index 92bc023..937e799 100644
--- a/src/Tokens.cc
+++ b/src/Tokens.cc
@@ -52,13 +52,13 @@ clangmm::Tokens::~Tokens() {
 }
 
 //This works across TranslationUnits. Similar tokens defined as tokens with equal canonical cursors. 
-std::vector<std::pair<clangmm::Offset, clangmm::Offset> > clangmm::Tokens::get_similar_token_offsets(Cursor::Kind kind, const std::string &spelling,
+std::vector<std::pair<clangmm::Offset, clangmm::Offset> > clangmm::Tokens::get_similar_token_offsets(const std::string &spelling,
                                                                                                      const std::unordered_set<std::string> &usrs) {
   std::vector<std::pair<Offset, Offset> > offsets;
   for(auto &token: *this) {
     if(token.is_identifier()) {
       auto referenced=token.get_cursor().get_referenced();
-      if(referenced && (kind!=Cursor::Kind::CXXMethod || kind==referenced.get_kind()) && spelling==token.get_spelling()) {
+      if(referenced && spelling==token.get_spelling()) {
         auto referenced_usrs=referenced.get_all_usr_extended();
         for(auto &usr: referenced_usrs) {
           if(usrs.count(usr)) {
diff --git a/src/Tokens.h b/src/Tokens.h
index 9a8c7ed..e3fa5b9 100644
--- a/src/Tokens.h
+++ b/src/Tokens.h
@@ -13,7 +13,7 @@ namespace clangmm {
     Tokens(CXTranslationUnit &cx_tu, const SourceRange &range);
   public:
     ~Tokens();
-    std::vector<std::pair<clangmm::Offset, clangmm::Offset> > get_similar_token_offsets(Cursor::Kind kind, const std::string &spelling,
+    std::vector<std::pair<clangmm::Offset, clangmm::Offset> > get_similar_token_offsets(const std::string &spelling,
                                                                                         const std::unordered_set<std::string> &usrs);
   private:
     CXToken *cx_tokens;