diff --git a/kstars/CMakeLists.txt b/kstars/CMakeLists.txt
--- a/kstars/CMakeLists.txt
+++ b/kstars/CMakeLists.txt
@@ -58,9 +58,6 @@
             )
 
         set (fits_SRCS
-            fitsviewer/fitshistogram.cpp
-            fitsviewer/fitsdata.cpp
-            fitsviewer/fitsview.cpp
             fitsviewer/fitslabel.cpp
             fitsviewer/fitsviewer.cpp
             fitsviewer/fitstab.cpp
@@ -72,8 +69,11 @@
         set(fits_SRCS ${fits_SRCS} fitsviewer/starprofileviewer.cpp)
         endif()
 
-        set (fits_bayer_SRCS
+        set (fits2_SRCS
             fitsviewer/bayer.c
+            fitsviewer/fitshistogram.cpp
+            fitsviewer/fitsdata.cpp
+            fitsviewer/fitsview.cpp
             )
         set (fitsui_SRCS
             fitsviewer/fitsheaderdialog.ui
@@ -90,7 +90,14 @@
 endif(NOT BUILD_KSTARS_LITE)
 
 IF (CFITSIO_FOUND AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
-    SET_SOURCE_FILES_PROPERTIES(fitsviewer/bayer.c PROPERTIES COMPILE_FLAGS "-Wno-cast-align")
+    IF (SANITIZERS)
+        SET_SOURCE_FILES_PROPERTIES(fitsviewer/bayer.c PROPERTIES COMPILE_FLAGS "-Wno-cast-align -fno-sanitize=address,undefined -fomit-frame-pointer")
+        SET_SOURCE_FILES_PROPERTIES(fitsviewer/fitsdata.cpp PROPERTIES COMPILE_FLAGS "-fno-sanitize=address,undefined -fomit-frame-pointer")
+        SET_SOURCE_FILES_PROPERTIES(fitsviewer/fitshistogram.cpp PROPERTIES COMPILE_FLAGS "-fno-sanitize=address,undefined -fomit-frame-pointer")
+        SET_SOURCE_FILES_PROPERTIES(fitsviewer/fitsview.cpp PROPERTIES COMPILE_FLAGS "-fno-sanitize=address,undefined -fomit-frame-pointer")
+    ELSE ()
+        SET_SOURCE_FILES_PROPERTIES(fitsviewer/bayer.c PROPERTIES COMPILE_FLAGS "-Wno-cast-align")
+    ENDIF ()
     SET_SOURCE_FILES_PROPERTIES(fitsviewer/sep/analyse.c PROPERTIES COMPILE_FLAGS "-Wno-cast-align")
     SET_SOURCE_FILES_PROPERTIES(fitsviewer/sep/aperture.c PROPERTIES COMPILE_FLAGS "-Wno-cast-align -Wno-pointer-arith")
     SET_SOURCE_FILES_PROPERTIES(fitsviewer/sep/background.c PROPERTIES COMPILE_FLAGS "-Wno-cast-align")
@@ -105,7 +112,7 @@
             set (fits_SRCS
                 fitsviewer/fitsdata.cpp
                 )
-            set (fits_bayer_SRCS
+            set (fits2_SRCS
                 fitsviewer/bayer.c
                 )
                 include_directories(${CFITSIO_INCLUDE_DIR})
@@ -900,7 +907,7 @@
     ENABLE_UNITY_BUILD(kstars kstars_SRCS 10 cpp)
 ENDIF ()
 
-set(kstars_SRCS ${kstars_SRCS} ${fits_bayer_SRCS} ${sep_SRCS} ${hips_manager_SRCS} ${kstarslite_libtess_SRC})
+set(kstars_SRCS ${kstars_SRCS} ${fits2_SRCS} ${sep_SRCS} ${hips_manager_SRCS} ${kstarslite_libtess_SRC})
 
 if(NOT BUILD_KSTARS_LITE)
     qt5_add_dbus_adaptor(kstars_SRCS org.kde.kstars.xml kstars.h KStars)
diff --git a/kstars/fitsviewer/fitsdata.cpp b/kstars/fitsviewer/fitsdata.cpp
--- a/kstars/fitsviewer/fitsdata.cpp
+++ b/kstars/fitsviewer/fitsdata.cpp
@@ -1970,7 +1970,6 @@
                         image[k + row] = qBound(min, image[k + row], max);
                 }
             }
-
             if (calcStats)
             {
                 stats.min[0] = min;