diff --git a/src/qcbor_decode.c b/src/qcbor_decode.c
index 87d119f..ff1516c 100644
--- a/src/qcbor_decode.c
+++ b/src/qcbor_decode.c
@@ -112,12 +112,13 @@
 
  */
 
-inline static int
-// TODO: make this bool
-// TODO: add Map as array?
+inline static bool
+// TODO: test  Map as array better?
 IsMapOrArray(uint8_t uDataType)
 {
-   return uDataType == QCBOR_TYPE_MAP || uDataType == QCBOR_TYPE_ARRAY;
+   return uDataType == QCBOR_TYPE_MAP ||
+          uDataType == QCBOR_TYPE_ARRAY ||
+          uDataType == QCBOR_TYPE_MAP_AS_ARRAY;
 }
 
 inline static bool