diff --git a/include/config.h b/include/config.h
index 34ce302e52..4c231a84de 100644
--- a/include/config.h
+++ b/include/config.h
@@ -23,15 +23,15 @@
 #define UNITS_METRIC
 #endif
 
+// Uncomment to fix some identified minor bugs
+//#define BUGFIX
+
 // Various undefined behavior bugs may or may not prevent compilation with
 // newer compilers. So always fix them when using a modern compiler.
-#if MODERN
+#if MODERN || defined(BUGFIX)
 #ifndef UBFIX
 #define UBFIX
 #endif
 #endif
 
-// Uncomment to fix some identified minor bugs
-//#define BUGFIX
-
 #endif // GUARD_CONFIG_H