diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt
index e42dac0e27c166fcd7abbb7c2a605808e715e913..44ed1c6e9edff510fe229c860e57f202aed07e6c 100644
--- a/tool/CMakeLists.txt
+++ b/tool/CMakeLists.txt
@@ -1,4 +1,5 @@
-find_file(OMPT_HEADER NAMES omp-tools.h)
+unset(OMPT_HEADER CACHE)
+find_file(OMPT_HEADER NAMES omp-tools.h HINTS ENV CPLUS_INCLUDE_PATH ENV C_INCLUDE_PATH)
 if (${OMPT_HEADER} STREQUAL "OMPT_HEADER-NOTFOUND")
   message(FATAL_ERROR "The OpenMP's OMPT header (omp-tools.h) was not found. Please check your OpenMP runtime installation.")
 endif()
diff --git a/tool/ompt_callbacks.cpp b/tool/ompt_callbacks.cpp
index 926bb336eda1002f5fd4de2ba4a5e2d68e052c7b..f73787d78bcd66c279d8340a032f9de1edf2bb48 100644
--- a/tool/ompt_callbacks.cpp
+++ b/tool/ompt_callbacks.cpp
@@ -187,9 +187,9 @@ static void ompt_decoder( ompt_dependence_t* dep, int i, void** addr, size_t* le
   if (dep[i].dependence_type & ompt_dependence_type_out)
     *mode |=KAAPI_ACCESS_MODE_W;
   if (dep[i].dependence_type & ompt_dependence_type_inout)
-    *mode |=KAAPI_ACCESS_MODE_CW;
+    *mode =KAAPI_ACCESS_MODE_R|KAAPI_ACCESS_MODE_W;
   //if (dep[i].dependence_flags.commute)
-    //*mode =KAAPI_ACCESS_MODE_R|KAAPI_ACCESS_MODE_W;
+    //*mode |=KAAPI_ACCESS_MODE_CW;
 }