diff --git a/CMakeLists.txt b/CMakeLists.txt
index 133ac84efdea4c5c8cbfa3402b9df64d19afc7b8..685088f708383b541bd63475ac9ea703fdd1987d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,14 +114,14 @@ if(EXTERNAL_BOOST)
 
     if(USE_PYTHON)
         if(${Boost_VERSION} VERSION_LESS 106700)
-         find_package(Boost ${NEEDED_Boost_VERSION} REQUIRED COMPONENTS python3 numpy3)
+            find_package(Boost ${NEEDED_Boost_VERSION} REQUIRED COMPONENTS python3 numpy3)
         else()
-         find_package(Boost ${NEEDED_Boost_VERSION} REQUIRED COMPONENTS python${BOOST_PYTHON_VERSION} numpy${BOOST_PYTHON_VERSION})
+            find_package(Boost ${NEEDED_Boost_VERSION} REQUIRED COMPONENTS python${BOOST_PYTHON_VERSION} numpy${BOOST_PYTHON_VERSION})
         endif()
+        # Append Python library to the list of Boost libraries.
+        set(Boost_PYTHON_LIBRARIES ${Boost_LIBRARIES})
+        set(Boost_LIBRARIES ${Boost_LIBS})
     endif()
-    # Append Python library to the list of Boost libraries.
-    list(APPEND Boost_LIBS ${Boost_LIBRARIES})
-    set(Boost_LIBRARIES ${Boost_LIBS})
 
     if(NOT Boost_FOUND)
         message(FATAL_ERROR "Boost not found.")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0f5372ea15bf039d065111a6c5c9c33cb9397b26..e9771c520c79afe21bfd9eb20bb0b4c68167f427 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,7 +30,7 @@ set_target_properties(sisso++
     LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
     RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
 )
-target_link_libraries(sisso++  ${LAPACK_LIBRARIES} ${MPI_LIBRARIES} -Wl,--rpath=${Boost_LIB_DIR} -Wl,--rpath=${LAPACK_DIR} ${Boost_LIBS})
+target_link_libraries(sisso++  ${LAPACK_LIBRARIES} ${MPI_LIBRARIES} -Wl,--rpath=${Boost_LIB_DIR} -Wl,--rpath=${LAPACK_DIR} ${Boost_LIBRARIES})
 install(TARGETS sisso++ DESTINATION ${CMAKE_CURRENT_LIST_DIR}/../bin/)
 
 if(USE_PYTHON)
@@ -59,8 +59,8 @@ if(USE_PYTHON)
         PREFIX ""
         SUFFIX ".so"
     )
-    # target_link_libraries(_sisso ${MPI_LIBRARIES} -Wl,--rpath=${PYTHON_PREFIX}/lib/ ${PYTHON_LAPACK_LIBRARIES} ${PYTHON_LIBRARIES}  -Wl,--rpath=${Boost_LIB_DIR} ${Boost_LIBS})
-    target_link_libraries(_sisso ${MPI_LIBRARIES} -Wl,--rpath=${PYTHON_PREFIX}/lib/ ${LAPACK_LIBRARIES} ${PYTHON_LIBRARIES}  -Wl,--rpath=${Boost_LIB_DIR} ${Boost_LIBS})
+    # target_link_libraries(_sisso ${MPI_LIBRARIES} -Wl,--rpath=${PYTHON_PREFIX}/lib/ ${PYTHON_LAPACK_LIBRARIES} ${PYTHON_LIBRARIES}  -Wl,--rpath=${Boost_LIB_DIR} ${Boost_LIBRARIES})
+    target_link_libraries(_sisso ${MPI_LIBRARIES} -Wl,--rpath=${PYTHON_PREFIX}/lib/ ${LAPACK_LIBRARIES} ${PYTHON_LIBRARIES}  -Wl,--rpath=${Boost_LIB_DIR} ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES})
     install(TARGETS _sisso DESTINATION "${PYTHON_INSTDIR}/sisso")
     install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/python/ DESTINATION ${PYTHON_INSTDIR}/sisso
         FILES_MATCHING PATTERN "*.py"