diff --git a/pyopencl/scan.py b/pyopencl/scan.py
index ab8aee30d188938c591ce1ac7116d4fbd92b7a18..6a59808137d1ac8ed99b936db1c91c1a0e7d11e3 100644
--- a/pyopencl/scan.py
+++ b/pyopencl/scan.py
@@ -157,16 +157,14 @@ void ${kernel_name}(
             scan_type value;
             int dummy;
         };
-        LOCAL_MEM struct wrapped_scan_type ldata[K + 1][WG_SIZE + 1];
     %else:
         struct wrapped_scan_type
         {
             scan_type value;
         };
-
-        // padded in WG_SIZE to avoid bank conflicts
-        LOCAL_MEM struct wrapped_scan_type ldata[K + 1][WG_SIZE];
     %endif
+    // padded in WG_SIZE to avoid bank conflicts
+    LOCAL_MEM struct wrapped_scan_type ldata[K + 1][WG_SIZE + 1];
 
     %if is_segmented:
         LOCAL_MEM char l_segment_start_flags[K][WG_SIZE];