diff --git a/libqdmetadata/qdMetaData.cpp b/libqdmetadata/qdMetaData.cpp
index fb32095..1810101 100644
--- a/libqdmetadata/qdMetaData.cpp
+++ b/libqdmetadata/qdMetaData.cpp
@@ -27,13 +27,16 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "qdMetaData.h"
+
+#include <QtiGrallocPriv.h>
 #include <errno.h>
+#include <gralloc_priv.h>
+#include <log/log.h>
 #include <string.h>
 #include <sys/mman.h>
-#include <log/log.h>
+
 #include <cinttypes>
-#include <gralloc_priv.h>
-#include "qdMetaData.h"
 
 static int colorMetaDataToColorSpace(ColorMetaData in, ColorSpace_t *out) {
   if (in.colorPrimaries == ColorPrimaries_BT601_6_525 ||
@@ -151,9 +154,11 @@
         case PP_PARAM_INTERLACED:
             data->interlaced = *((int32_t *)param);
             break;
-        case UPDATE_BUFFER_GEOMETRY:
-            data->bufferDim = *((BufferDim_t *)param);
-            break;
+        case UPDATE_BUFFER_GEOMETRY: {
+          BufferDim_t in = *((BufferDim_t *)param);
+          data->crop = {0, 0, in.sliceWidth, in.sliceHeight};
+          break;
+        }
         case UPDATE_REFRESH_RATE:
             data->refreshrate = *((float *)param);
             break;
@@ -301,8 +306,8 @@
             break;
         case GET_BUFFER_GEOMETRY:
             if (data->operation & UPDATE_BUFFER_GEOMETRY) {
-                *((BufferDim_t *)param) = data->bufferDim;
-                ret = 0;
+              *((BufferDim_t *)param) = {data->crop.right, data->crop.bottom};
+              ret = 0;
             }
             break;
         case GET_REFRESH_RATE: