diff --git a/etc/cmake/Findsick_scan_base.cmake b/etc/cmake/Findsick_scan_base.cmake
index 391b22908e16b2808efbff5bdf5105d1bd2aada9..faef3317d146d5fb44bddda029cf17d85128e3f2 100644
--- a/etc/cmake/Findsick_scan_base.cmake
+++ b/etc/cmake/Findsick_scan_base.cmake
@@ -5,7 +5,12 @@
 
 include(FindPackageHandleStandardArgs)
 
-message(STATUS ${sick_scan_base_DIR})
+
+if (DEFINED ENV{sick_scan_base_DIR})
+	if(NOT DEFINED sick_scan_base_DIR)
+		set(sick_scan_base_DIR $ENV{sick_scan_base_DIR})
+	endif()
+endif()
 
 #if(NOT "$ENV{sick_scan_base_DIR}" EQUAL "")
 #    set(sick_scan_base_DIR $ENV{sick_scan_base_DIR} CACHE PATH "Path to sick_scan_base" FORCE)
diff --git a/source/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.cpp b/source/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.cpp
index 649d40ccf31ae409e140f651c40010c7fd22ad8b..40250b2b1a7d0dc472806715fe6c4daf9b532f17 100644
--- a/source/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.cpp
+++ b/source/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.cpp
@@ -435,7 +435,7 @@ namespace armarx
             LaserScanStep step;
             step.angle = i * scanInfo.stepSize;
             step.distance = distVal[i];
-            step.intensity = intensityVal[i];
+            //step.intensity = intensityVal[i];
             scanData.push_back(step);
         }