Index: NVDataMgmt.c
===================================================================
diff -u -rffe083e9d0c1b1281d905c49c291a82a085f0413 -r16de98f80dfcd40eab45485606b0f87ef2320316
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision ffe083e9d0c1b1281d905c49c291a82a085f0413)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 16de98f80dfcd40eab45485606b0f87ef2320316)
@@ -2150,7 +2150,7 @@
         {
             currentTime = getMSTimerCount();
             U32 startAddress = jobSpecs.startAddress + recordAddressOffset;
-            U32 maxBufferLength = ( jobSpecs.maxWriteBufferSize / EEPROM_OPS_SIZE_OF_CONVERTER );
+            U32 maxBufferLength = jobSpecs.maxWriteBufferSize / EEPROM_OPS_SIZE_OF_CONVERTER;
 
             // Clear the buffer from the previous content
             memset( writtenRecordCheckBuffer, 0, sizeof(writtenRecordCheckBuffer));
@@ -2178,7 +2178,7 @@
                 writtenRecordStatus = NVDATAMGMT_RECORD_NOT_CHECKED;
 
                 // The length should be divided by 4
-                U32 maxBufferLength = jobSpecs.maxWriteBufferSize;
+                U32 maxBufferLength = jobSpecs.maxWriteBufferSize / EEPROM_OPS_SIZE_OF_CONVERTER;
 
                 // Issue the write command
                 Fapi_issueProgrammingCommand ( (U32*)memoryPtr, structPtr, maxBufferLength, 0x00, 0, Fapi_DataOnly );