diff --git a/src/source.cc b/src/source.cc
index a73af94..e3faa4c 100644
--- a/src/source.cc
+++ b/src/source.cc
@@ -1825,7 +1825,7 @@ Source::ClangViewAutocomplete(file_path, project_path, language) {
   
   tag_similar_tokens=[this](const std::pair<std::string, int> &token){
     if(source_readable) {
-      if(token.second!=0 && token.first.size()>0 && last_similar_tokens_tagged!=token.first) {
+      if(token.second>=0 && token.first.size()>0 && last_similar_tokens_tagged!=token.first) {
         get_buffer()->remove_tag(similar_tokens_tag, get_buffer()->begin(), get_buffer()->end());
         auto offsets=clang_tokens->get_similar_token_offsets(token.first, static_cast<clang::CursorKind>(token.second));
         for(auto &offset: offsets) {
@@ -1834,7 +1834,7 @@ Source::ClangViewAutocomplete(file_path, project_path, language) {
         last_similar_tokens_tagged=token.first;
       }
     }
-    if(token.second!=0 && token.first.size()==0 && last_similar_tokens_tagged!="") {
+    if(token.second>=0 && token.first.size()==0 && last_similar_tokens_tagged!="") {
       get_buffer()->remove_tag(similar_tokens_tag, get_buffer()->begin(), get_buffer()->end());
       last_similar_tokens_tagged="";
     }
diff --git a/src/window.cc b/src/window.cc
index 6fe14c8..9045a86 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -676,7 +676,7 @@ void Window::rename_token_entry() {
   if(notebook.get_current_page()!=-1) {
     if(notebook.get_current_view()->get_token && notebook.get_current_view()->get_token_name) {
       auto token=std::make_shared<std::pair<std::string, int> >(notebook.get_current_view()->get_token());
-      if(token->second!=0 && token->first.size()>0 && notebook.get_current_view()->get_token_name) {
+      if(token->second>=0 && token->first.size()>0 && notebook.get_current_view()->get_token_name) {
         auto token_name=std::make_shared<std::string>(notebook.get_current_view()->get_token_name());
         for(int c=0;c<notebook.size();c++) {
           if(notebook.get_view(c)->tag_similar_tokens) {