diff --git a/include/envs.h b/include/envs.h
index 305caa0a..36744005 100644
--- a/include/envs.h
+++ b/include/envs.h
@@ -114,9 +114,9 @@ static char *afl_environment_variables[] = {
     "AFL_STATSD_TAGS_FLAVOR", "AFL_SYNC_TIME", "AFL_TESTCACHE_SIZE",
     "AFL_TESTCACHE_ENTRIES", "AFL_TMIN_EXACT", "AFL_TMPDIR", "AFL_TOKEN_FILE",
     "AFL_TRACE_PC", "AFL_USE_ASAN", "AFL_USE_MSAN", "AFL_USE_TRACE_PC",
-    "AFL_USE_UBSAN", "AFL_USE_TSAN", "AFL_USE_CFISAN","AFL_CFISAN_VERBOSE", "AFL_USE_LSAN",
-    "AFL_WINE_PATH", "AFL_NO_SNAPSHOT", "AFL_EXPAND_HAVOC_NOW", "AFL_USE_FASAN",
-    "AFL_USE_QASAN", "AFL_PRINT_FILENAMES", "AFL_PIZZA_MODE",
+    "AFL_USE_UBSAN", "AFL_USE_TSAN", "AFL_USE_CFISAN", "AFL_CFISAN_VERBOSE",
+    "AFL_USE_LSAN", "AFL_WINE_PATH", "AFL_NO_SNAPSHOT", "AFL_EXPAND_HAVOC_NOW",
+    "AFL_USE_FASAN", "AFL_USE_QASAN", "AFL_PRINT_FILENAMES", "AFL_PIZZA_MODE",
     "AFL_NO_FASTRESUME", NULL
 
 };
diff --git a/src/afl-cc.c b/src/afl-cc.c
index 5c3273c7..c568a845 100644
--- a/src/afl-cc.c
+++ b/src/afl-cc.c
@@ -2007,17 +2007,14 @@ void add_sanitizers(aflcc_state_t *aflcc, char **envp) {
 
       }
 
-      if (!aflcc->have_cfisan) {
+      if (!aflcc->have_cfisan) { insert_param(aflcc, "-fsanitize=cfi"); }
+
+      if (getenv("AFL_CFISAN_VERBOSE")) {
+
+        insert_param(aflcc, "-fno-sanitize-trap=cfi");
 
-        insert_param(aflcc, "-fsanitize=cfi");
       }
 
-      if ( getenv("AFL_CFISAN_VERBOSE") )
-		{
-        	insert_param(aflcc, "-fno-sanitize-trap=cfi");
-		}
-
-
       if (!aflcc->have_hidden) {
 
         insert_param(aflcc, "-fvisibility=hidden");