diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index d90954cd2..6afaa3470 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -28,20 +28,20 @@
 
 #ifdef SEGMENT
   #undef SEGMENT
-  #define SEGMENT          _segments[_segment_index]
 #endif
 #ifdef SEGCOLOR
   #undef SEGCOLOR
-  #define SEGCOLOR(x)      _colors_t[x]
 #endif
 #ifdef SEGENV
   #undef SEGENV
-  #define SEGENV           _segment_runtimes[_segment_index]
 #endif
 #ifdef SEGLEN
   #undef SEGLEN
-  #define SEGLEN           _virtualSegmentLength
 #endif
+#define SEGMENT          _segments[_segment_index]
+#define SEGCOLOR(x)      _colors_t[x]
+#define SEGENV           _segment_runtimes[_segment_index]
+#define SEGLEN           _virtualSegmentLength
 
 // setUpMatrix() - constructs ledmap array from matrix of panels with WxH pixels
 // this converts physical (possibly irregular) LED arrangement into well defined
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 8ac84bfd4..023e6ce92 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -29,20 +29,20 @@
 
 #ifdef SEGMENT
   #undef SEGMENT
-  #define SEGMENT          _segments[_segment_index]
 #endif
 #ifdef SEGCOLOR
   #undef SEGCOLOR
-  #define SEGCOLOR(x)      _colors_t[x]
 #endif
 #ifdef SEGENV
   #undef SEGENV
-  #define SEGENV           _segment_runtimes[_segment_index]
 #endif
 #ifdef SEGLEN
   #undef SEGLEN
-  #define SEGLEN           _virtualSegmentLength
 #endif
+#define SEGMENT          _segments[_segment_index]
+#define SEGCOLOR(x)      _colors_t[x]
+#define SEGENV           _segment_runtimes[_segment_index]
+#define SEGLEN           _virtualSegmentLength
 
 /*
   Custom per-LED mapping has moved!