diff --git a/cmake/Modules/FindVOLK.cmake b/cmake/Modules/FindVOLK.cmake
index 5e837fb0f..b3e58f71f 100644
--- a/cmake/Modules/FindVOLK.cmake
+++ b/cmake/Modules/FindVOLK.cmake
@@ -84,6 +84,7 @@ if(NOT VOLK_VERSION)
     list(GET VOLK_LIBRARIES 0 FIRST_DIR)
     get_filename_component(VOLK_LIB_DIR ${FIRST_DIR} DIRECTORY)
     if(EXISTS ${VOLK_LIB_DIR}/cmake/volk/VolkConfigVersion.cmake)
+        set(PACKAGE_FIND_VERSION_MAJOR 0)
         include(${VOLK_LIB_DIR}/cmake/volk/VolkConfigVersion.cmake)
     endif()
     if(PACKAGE_VERSION)
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfigVersion.cmake.in b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfigVersion.cmake.in
index 6946b0cb5..b7096e285 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfigVersion.cmake.in
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfigVersion.cmake.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018 (see AUTHORS file for a list of contributors)
+# Copyright (C) 2015-2020 (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -8,14 +8,13 @@ set(MAJOR_VERSION @VERSION_INFO_MAJOR_VERSION@)
 set(MINOR_VERSION @VERSION_INFO_MINOR_VERSION@)
 set(MAINT_VERSION @VERSION_INFO_MAINT_VERSION@)
 
-set(PACKAGE_VERSION
-  ${MAJOR_VERSION}.${MINOR_VERSION}.${MAINT_VERSION})
+set(PACKAGE_VERSION ${MAJOR_VERSION}.${MINOR_VERSION}.${MAINT_VERSION})
 
-if(${PACKAGE_FIND_VERSION_MAJOR} EQUAL ${MAJOR_VERSION})
-  if(${PACKAGE_FIND_VERSION_MINOR} EQUAL ${MINOR_VERSION})
-    if(NOT ${PACKAGE_FIND_VERSION_PATCH} GREATER ${MAINT_VERSION})
-      set(PACKAGE_VERSION_EXACT 1)    # exact match for API version
-      set(PACKAGE_VERSION_COMPATIBLE 1)  # compat for minor/patch version
+if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL ${MAJOR_VERSION})
+    if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL ${MINOR_VERSION})
+        if(NOT "${PACKAGE_FIND_VERSION_PATCH}" GREATER ${MAINT_VERSION})
+            set(PACKAGE_VERSION_EXACT 1)       # exact match for API version
+            set(PACKAGE_VERSION_COMPATIBLE 1)  # compat for minor/patch version
+        endif()
     endif()
-  endif()
 endif()