diff --git a/CMakeLists.txt b/CMakeLists.txt
index 685088f708383b541bd63475ac9ea703fdd1987d..e8daf6ff8e875e61bc944f5684bcbc398ab84574 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -243,10 +243,10 @@ else(EXTERNAL_BOOST)
     set_property( TARGET boost::filesystem PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS} )
     add_dependencies( boost::filesystem external_boost )
 
-    set(Boost_LIBS ${Boost_LIBRARY_DIRS}/${Boost_LIBRARY_PREFIX}boost_mpi${Boost_LIBRARY_SUFFIX})
-    list(APPEND Boost_LIBS ${Boost_LIBRARY_DIRS}/${Boost_LIBRARY_PREFIX}boost_serialization${Boost_LIBRARY_SUFFIX})
-    list(APPEND Boost_LIBS ${Boost_LIBRARY_DIRS}/${Boost_LIBRARY_PREFIX}boost_system${Boost_LIBRARY_SUFFIX})
-    list(APPEND Boost_LIBS ${Boost_LIBRARY_DIRS}/${Boost_LIBRARY_PREFIX}boost_filesystem${Boost_LIBRARY_SUFFIX})
+    set(Boost_LIBRARIES ${Boost_LIBRARY_DIRS}/${Boost_LIBRARY_PREFIX}boost_mpi${Boost_LIBRARY_SUFFIX})
+    list(APPEND Boost_LIBRARIES ${Boost_LIBRARY_DIRS}/${Boost_LIBRARY_PREFIX}boost_serialization${Boost_LIBRARY_SUFFIX})
+    list(APPEND Boost_LIBRARIES ${Boost_LIBRARY_DIRS}/${Boost_LIBRARY_PREFIX}boost_system${Boost_LIBRARY_SUFFIX})
+    list(APPEND Boost_LIBRARIES ${Boost_LIBRARY_DIRS}/${Boost_LIBRARY_PREFIX}boost_filesystem${Boost_LIBRARY_SUFFIX})
     if(USE_PYTHON)
         add_library( boost::python${BOOST_PYTHON_VERSION} SHARED IMPORTED )
         set_property( TARGET boost::python${BOOST_PYTHON_VERSION} PROPERTY IMPORTED_LOCATION ${Boost_LIBRARY_DIRS}/${Boost_LIBRARY_PREFIX}boost_python${BOOST_PYTHON_VERSION}${Boost_LIBRARY_SUFFIX} )
@@ -258,9 +258,8 @@ else(EXTERNAL_BOOST)
         set_property( TARGET boost::numpy${BOOST_PYTHON_VERSION} PROPERTY INTERFACE_LINK_LIBRARIES boost::system )
         set_property( TARGET boost::numpy${BOOST_PYTHON_VERSION} PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS} )
         add_dependencies( boost::numpy${BOOST_PYTHON_VERSION} external_boost )
-
-        list(APPEND Boost_LIBS ${Boost_LIBRARY_DIRS}/${Boost_LIBRARY_PREFIX}boost_python${BOOST_PYTHON_VERSION}${Boost_LIBRARY_SUFFIX})
-        list(APPEND Boost_LIBS ${Boost_LIBRARY_DIRS}/${Boost_LIBRARY_PREFIX}boost_numpy${BOOST_PYTHON_VERSION}${Boost_LIBRARY_SUFFIX})
+        set(Boost_PYTHON_LIBRARIES ${Boost_LIBRARY_DIRS}/${Boost_LIBRARY_PREFIX}boost_python${BOOST_PYTHON_VERSION}${Boost_LIBRARY_SUFFIX})
+        list(APPEND Boost_PYTHON_LIBRARIES ${Boost_LIBRARY_DIRS}/${Boost_LIBRARY_PREFIX}boost_numpy${BOOST_PYTHON_VERSION}${Boost_LIBRARY_SUFFIX})
     endif()
 endif()
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d503ddceb880481cf96c381fb2ec2a91477c35bc..5748c10a15c5e951b41e2ed649f96f6b860292b5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,7 +30,8 @@ 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})
+message(STATUS ${Boost_LIBRARIES})
+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)
@@ -60,7 +61,7 @@ if(USE_PYTHON)
         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} ${Boost_PYTHON_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"