diff --git a/src/debug.cc b/src/debug.cc
index e1744e2..7756e78 100644
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -172,20 +172,45 @@ void Debug::delete_debug() {
     debug_thread.join();
 }
 
-std::string Debug::get_value(const std::string &variable) {
+std::string Debug::get_value(const std::string &variable, const boost::filesystem::path &file_path, unsigned int line_nr) {
   std::string variable_value;
   event_mutex.lock();
   if(state==lldb::StateType::eStateStopped) {
     auto frame=process->GetSelectedThread().GetSelectedFrame();
+    
     auto values=frame.GetVariables(true, true, true, true);
+    //First try to find variable based on name, file and line number
     for(uint32_t value_index=0;value_index<values.GetSize();value_index++) {
       lldb::SBStream stream;
       auto value=values.GetValueAtIndex(value_index);
 
       if(value.GetName()==variable) {
-        value.GetDescription(stream);
-        variable_value=stream.GetData();
-        break;
+        auto declaration=value.GetDeclaration();
+        if(declaration.IsValid()) {
+          if(declaration.GetLine()==line_nr) {
+            auto file_spec=declaration.GetFileSpec();
+            boost::filesystem::path value_decl_path=file_spec.GetDirectory();
+            value_decl_path/=file_spec.GetFilename();
+            if(value_decl_path==file_path) {
+              value.GetDescription(stream);
+              variable_value=stream.GetData();
+              break;
+            }
+          }
+        }
+      }
+    }
+    if(variable_value.empty()) {
+      //In case a variable is missing file and line number, only do check on name
+      for(uint32_t value_index=0;value_index<values.GetSize();value_index++) {
+        lldb::SBStream stream;
+        auto value=values.GetValueAtIndex(value_index);
+
+        if(value.GetName()==variable) {
+          value.GetDescription(stream);
+          variable_value=stream.GetData();
+          break;
+        }
       }
     }
   }
diff --git a/src/debug.h b/src/debug.h
index 4f03856..1997717 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -29,7 +29,7 @@ public:
   
   void delete_debug(); //can't use delete as function name
   
-  std::string get_value(const std::string &variable);
+  std::string get_value(const std::string &variable, const boost::filesystem::path &file_path, unsigned int line_nr);
     
 private:
   lldb::SBDebugger debugger;
diff --git a/src/source_clang.cc b/src/source_clang.cc
index f1fb2d1..6ddf380 100644
--- a/src/source_clang.cc
+++ b/src/source_clang.cc
@@ -413,7 +413,8 @@ void Source::ClangViewParse::show_type_tooltips(const Gdk::Rectangle &rectangle)
             auto brief_comment=token.get_cursor().get_brief_comments();
             if(brief_comment!="")
               tooltip_buffer->insert_with_tag(tooltip_buffer->get_insert()->get_iter(), "\n\n"+brief_comment, "def:note");
-            auto debug_value=Debug::get().get_value(token.get_spelling());
+            auto location=token.get_cursor().get_referenced().get_source_location();
+            auto debug_value=Debug::get().get_value(token.get_spelling(), location.get_path(), location.get_offset().line);
             if(!debug_value.empty()) {
               debug_value.pop_back();
               size_t pos=debug_value.find(" = ");