diff --git a/cmake/Modules/SetupPython.cmake b/cmake/Modules/SetupPython.cmake
index b80994ee4..2dc93b955 100644
--- a/cmake/Modules/SetupPython.cmake
+++ b/cmake/Modules/SetupPython.cmake
@@ -146,7 +146,26 @@ else()
             endif()
             gnsssdr_python_check_module("python >= ${GNSSSDR_PYTHON_MIN_VERSION}" sys "sys.version.split()[0] >= '${GNSSSDR_PYTHON_MIN_VERSION}'" PYTHON_MIN_VER_FOUND)
             gnsssdr_python_check_module("mako >= ${GNSSSDR_MAKO_MIN_VERSION}" mako "mako.__version__ >= '${GNSSSDR_MAKO_MIN_VERSION}'" MAKO_FOUND)
-            if(PYTHON_VERSION_STRING VERSION_LESS "3.0")
+            if(NOT MAKO_FOUND)
+                unset(PYTHON_EXECUTABLE)
+                unset(PYTHON_VERSION_STRING)
+                unset(PYTHON_VERSION_MAJOR)
+                find_program(PYTHON_EXECUTABLE NAMES python3 python)
+                if(PYTHON_EXECUTABLE)
+                    set(PYTHONINTERP_FOUND TRUE)
+                    execute_process(COMMAND "${PYTHON_EXECUTABLE} --version" OUTPUT_VARIABLE PYTHON_VERSION_STRING_AUX)
+                    string(FIND "${PYTHON_VERSION_STRING_AUX}" " " blank_char_index)
+                    if(blank_char_index GREATER -1)
+                        math(EXPR start_index "${blank_char_index} + 1")
+                        string(SUBSTRING "${PYTHON_VERSION_STRING_AUX}" ${start_index} -1 PYTHON_VERSION_STRING)
+                        string(STRIP ${PYTHON_VERSION_STRING} PYTHON_VERSION_STRING)
+                        string(SUBSTRING "${PYTHON_VERSION_STRING_AUX}" ${start_index} 1 PYTHON_VERSION_MAJOR)
+                        message(STATUS "Found Python: ${PYTHON_EXECUTABLE} (found version: ${PYTHON_VERSION_STRING})")
+                    endif()
+                endif()
+                volk_python_check_module("mako >= 0.4.2" mako "mako.__version__ >= '0.4.2'" MAKO_FOUND)
+            endif()
+            if(MAKO_FOUND AND PYTHON_VERSION_STRING VERSION_LESS "3.0")
                 gnsssdr_python_check_module("six - python 2 and 3 compatibility library" six "True" SIX_FOUND)
             endif()
         endif()
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkPython.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkPython.cmake
index 13b8a2759..697fe8c3b 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkPython.cmake
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkPython.cmake
@@ -146,11 +146,24 @@ else()
                 volk_python_check_module("mako >= 0.4.2" mako "mako.__version__ >= '0.4.2'" MAKO_FOUND)
                 if(NOT MAKO_FOUND)
                     unset(PYTHON_EXECUTABLE)
+                    unset(PYTHON_VERSION_STRING)
                     find_program(PYTHON_EXECUTABLE NAMES python3 python)
                     if(PYTHON_EXECUTABLE)
                         set(PYTHONINTERP_FOUND TRUE)
+                        execute_process(COMMAND ${PYTHON_EXECUTABLE} --version OUTPUT_VARIABLE PYTHON_VERSION_STRING_AUX)
+                        string(FIND "${PYTHON_VERSION_STRING_AUX}" " " blank_char_index)
+                        if(blank_char_index GREATER -1)
+                            math(EXPR start_index "${blank_char_index} + 1")
+                            string(SUBSTRING "${PYTHON_VERSION_STRING_AUX}" ${start_index} -1 PYTHON_VERSION_STRING)
+                            string(STRIP ${PYTHON_VERSION_STRING} PYTHON_VERSION_STRING)
+                            string(SUBSTRING "${PYTHON_VERSION_STRING_AUX}" ${start_index} 1 PYTHON_VERSION_MAJOR)
+                            message(STATUS "Found Python: ${PYTHON_EXECUTABLE} (found version: ${PYTHON_VERSION_STRING})")
+                        endif()
+                        volk_python_check_module("mako >= 0.4.2" mako "mako.__version__ >= '0.4.2'" MAKO_FOUND)
+                        if(MAKO_FOUND AND PYTHON_VERSION_STRING VERSION_LESS "3.0")
+                            gnsssdr_python_check_module("six - python 2 and 3 compatibility library" six "True" SIX_FOUND)
+                        endif()
                     endif()
-                    volk_python_check_module("mako >= 0.4.2" mako "mako.__version__ >= '0.4.2'" MAKO_FOUND)
                 endif()
             endif()
         endif()