diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index e35b15b..6227a8c 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -296,12 +296,18 @@
 
 #if CONFIG_FLEX_PARTITION
   // 1:8 blocks
+  MAKE_SM_DATA_BUF(8, 64);
+  MAKE_SM_DATA_BUF(4, 32);
+
+  // 8:1 blocks
   MAKE_SM_DATA_BUF(64, 8);
   MAKE_SM_DATA_BUF(32, 4);
 
-  // 8:1 blocks
-  MAKE_SM_DATA_BUF(8, 64);
-  MAKE_SM_DATA_BUF(4, 32);
+  // 1:16 blocks
+  MAKE_SM_DATA_BUF(4, 64);
+
+  // 16:1 blocks
+  MAKE_SM_DATA_BUF(64, 4);
 #endif  // CONFIG_FLEX_PARTITION
 } SimpleMotionDataBufs;
 
diff --git a/av1/encoder/partition_strategy.c b/av1/encoder/partition_strategy.c
index f219369..f062b54 100644
--- a/av1/encoder/partition_strategy.c
+++ b/av1/encoder/partition_strategy.c
@@ -1430,12 +1430,18 @@
 
 #if CONFIG_FLEX_PARTITION
     // 1:8 blocks
+    MAKE_SMS_ARR_SWITCH_CASE(8, 64);
+    MAKE_SMS_ARR_SWITCH_CASE(4, 32);
+
+    // 8:1 blocks
     MAKE_SMS_ARR_SWITCH_CASE(64, 8);
     MAKE_SMS_ARR_SWITCH_CASE(32, 4);
 
-    // 8:1 blocks
-    MAKE_SMS_ARR_SWITCH_CASE(8, 64);
-    MAKE_SMS_ARR_SWITCH_CASE(4, 32);
+    // 16:1 blocks
+    MAKE_SMS_ARR_SWITCH_CASE(64, 4);
+
+    // 1:16 blocks
+    MAKE_SMS_ARR_SWITCH_CASE(4, 64);
 #endif  // CONFIG_FLEX_PARTITION
 
     default: assert(0 && "Invalid bsize"); return NULL;