diff --git a/CMakeLists.txt b/CMakeLists.txt
index 146a0f3a334a54db4de96e09ffa3ac40aaa3bb4d..90765e7c8f12d53ae8b327f9480ccb399ba8d80e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,36 +43,23 @@ add_library(subscriber_${PROJECT_NAME}
   ${CMAKE_CURRENT_SOURCE_DIR}/src/subscriber_laser2d.cpp
 )
 
-get_target_property(wolflaser_INCLUDE_DIRS wolflaser INTERFACE_INCLUDE_DIRECTORIES)
+get_target_property(wolflaser_INCLUDE_DIR wolflaser INTERFACE_INCLUDE_DIRECTORIES)
 message("wolflaser_INCLUDE_DIRS: ${wolflaser_INCLUDE_DIRS}")
-find_file(FALKO processor_loop_cosure_falko.h PATHS wolflaser_INCLUDE_DIRS PATH_SUFFIXES laser/processor /laser/processor laser/processor/ /laser/processor/ NO_DEFAULT_PATH)
-find_file(ICP laser/processor/processor_odom_icp.h PATHS wolflaser_INCLUDE_DIRS NO_DEFAULT_PATH)
-
-message("FALKO: ${FALKO}")
-if (NOT FALKO-NOTFOUND)
-  message("NOT FALKO-NOTFOUND")
-else()
-  message("FALKO-NOTFOUND")
-endif()
-message("ICP: ${ICP}")
-if (NOT ICP-NOTFOUND)
-  message("NOT ICP-NOTFOUND")
-else()
-  message("ICP-NOTFOUND")
-endif()
+find_file(FALKO laser/processor/processor_loop_closure_falko.h PATHS ${wolflaser_INCLUDE_DIR})
+find_file(ICP laser/processor/processor_odom_icp.h PATHS ${wolflaser_INCLUDE_DIR})
 
 if (FALKO)
-	message("Found 'processor_loop_cosure_falko.h'. Compiling publisher_falko.")
+	message("Found 'laser/processor/processor_loop_closure_falko.h'. Compiling publisher_falko.")
 	target_sources(publisher_${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src/publisher_falko.cpp)
 else()
-  message("Didn't find 'processor_loop_cosure_falko.h'. Not compiling publisher_falko.")
+  message("Didn't find 'laser/processor/processor_loop_closure_falko.h'. Not compiling publisher_falko.")
 endif()
 
 if (ICP)
-	message("Found 'processor_odom_icp.h'. Compiling publisher_odom_icp.")
+	message("Found 'laser/processor/processor_odom_icp.h'. Compiling publisher_odom_icp.")
 	target_sources(publisher_${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src/publisher_odom_icp.cpp)
 else()
-  message("Didn't find 'processor_odom_icp.h'. Not compiling publisher_odom_icp.")
+  message("Didn't find 'laser/processor/processor_odom_icp.h'. Not compiling publisher_odom_icp.")
 endif ()
 
 ## Specify libraries to link a library or executable target against