diff --git a/client/src/main.c b/client/src/main.c
index 45865d59..36c764a9 100644
--- a/client/src/main.c
+++ b/client/src/main.c
@@ -375,8 +375,7 @@ static int frameThread(void * unused)
   size_t            dataSize;
   LG_RendererFormat lgrFormat;
 
-  //FIXME: Should use LGMP_Q_FRAME_LEN
-  struct DMAFrameInfo dmaInfo[2] = {0};
+  struct DMAFrameInfo dmaInfo[LGMP_Q_FRAME_LEN] = {0};
   const bool useDMA =
     params.allowDMA &&
     ivshmemHasDMA(&state.shm) &&
diff --git a/common/include/common/KVMFR.h b/common/include/common/KVMFR.h
index ddb650c4..a764edce 100644
--- a/common/include/common/KVMFR.h
+++ b/common/include/common/KVMFR.h
@@ -23,6 +23,9 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #define LGMP_Q_POINTER     1
 #define LGMP_Q_FRAME       2
 
+#define LGMP_Q_FRAME_LEN   2
+#define LGMP_Q_POINTER_LEN 20
+
 typedef enum FrameType
 {
   FRAME_TYPE_INVALID   ,
diff --git a/host/src/app.c b/host/src/app.c
index b29f2011..a8551f0b 100644
--- a/host/src/app.c
+++ b/host/src/app.c
@@ -44,9 +44,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #define ALIGN_DN(x) ((uintptr_t)(x) & ~0x7F)
 #define ALIGN_UP(x) ALIGN_DN(x + 0x7F)
 
-#define LGMP_Q_FRAME_LEN   2
-#define LGMP_Q_POINTER_LEN 20
-
 static const struct LGMPQueueConfig FRAME_QUEUE_CONFIG =
 {
   .queueID     = LGMP_Q_FRAME,