diff --git a/src/strategies/generic/picture-generic.c b/src/strategies/generic/picture-generic.c
index 98a08d94..2428485f 100644
--- a/src/strategies/generic/picture-generic.c
+++ b/src/strategies/generic/picture-generic.c
@@ -557,9 +557,9 @@ static void bipred_average_px_px(kvz_pixel *dst,
   int32_t shift = 15 - KVZ_BIT_DEPTH; // TODO: defines
   int32_t offset = 1 << (shift - 1);
 
-  for (int i = 0; i < pu_w * pu_h; ++i)
-  {
-    int y = i / pu_w;
+  for (int i = 0; i < pu_w * pu_h; ++i)
+  {
+    int y = i / pu_w;
     int x = i % pu_w;
     int16_t sample_L0 = px_L0[i] << (14 - KVZ_BIT_DEPTH);
     int16_t sample_L1 = px_L1[i] << (14 - KVZ_BIT_DEPTH);
@@ -578,9 +578,9 @@ static void bipred_average_im_im(kvz_pixel *dst,
   int32_t shift = 15 - KVZ_BIT_DEPTH; // TODO: defines
   int32_t offset = 1 << (shift - 1);
 
-  for (int i = 0; i < pu_w * pu_h; ++i)
-  {
-    int y = i / pu_w;
+  for (int i = 0; i < pu_w * pu_h; ++i)
+  {
+    int y = i / pu_w;
     int x = i % pu_w;
     int16_t sample_L0 = im_L0[i];
     int16_t sample_L1 = im_L1[i];
@@ -599,9 +599,9 @@ static void bipred_average_px_im(kvz_pixel *dst,
   int32_t shift = 15 - KVZ_BIT_DEPTH; // TODO: defines
   int32_t offset = 1 << (shift - 1);
 
-  for (int i = 0; i < pu_w * pu_h; ++i)
-  {
-    int y = i / pu_w;
+  for (int i = 0; i < pu_w * pu_h; ++i)
+  {
+    int y = i / pu_w;
     int x = i % pu_w;
     int16_t sample_px = px[i] << (14 - KVZ_BIT_DEPTH);
     int16_t sample_im = im[i];