diff --git a/CMakeLists.txt b/CMakeLists.txt
index f61f05e..137418f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
 
 # Set up the project
 project(levelx
-    VERSION 6.0.0 
     LANGUAGES C ASM
 )
 
diff --git a/common/inc/lx_api.h b/common/inc/lx_api.h
index 3a82f2b..e33072a 100644
--- a/common/inc/lx_api.h
+++ b/common/inc/lx_api.h
@@ -26,7 +26,7 @@
 /*  APPLICATION INTERFACE DEFINITION                       RELEASE        */
 /*                                                                        */
 /*    lx_api.h                                            PORTABLE C      */
-/*                                                           6.1.7        */
+/*                                                           6.1.8        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -55,6 +55,9 @@
 /*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
 /*                                            added standalone support,   */
 /*                                            resulting in version 6.1.7  */
+/*  08-02-2021     William E. Lamie         Modified comment(s), and      */
+/*                                            updated product constants,  */
+/*                                            resulting in version 6.1.8  */
 /*                                                                        */
 /**************************************************************************/
 
@@ -159,7 +162,7 @@ typedef unsigned long long                      ULONG64;
 #define AZURE_RTOS_LEVELX
 #define LEVELX_MAJOR_VERSION                        6
 #define LEVELX_MINOR_VERSION                        1
-#define LEVELX_PATCH_VERSION                        7
+#define LEVELX_PATCH_VERSION                        8
 
 
 /* Define general LevelX Constants.  */
diff --git a/common/src/lx_nand_flash_block_reclaim.c b/common/src/lx_nand_flash_block_reclaim.c
index 716adf9..8f1463f 100644
--- a/common/src/lx_nand_flash_block_reclaim.c
+++ b/common/src/lx_nand_flash_block_reclaim.c
@@ -40,7 +40,7 @@
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    _lx_nand_flash_block_reclaim                        PORTABLE C      */ 
-/*                                                           6.1.7        */
+/*                                                           6.1.8        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -88,6 +88,9 @@
 /*                                            resulting in version 6.1    */
 /*  06-02-2021     Bhupendra Naphade        Modified comment(s),          */
 /*                                            resulting in version 6.1.7  */
+/*  08-02-2021     Bhupendra Naphade        Modified comment(s), updated  */
+/*                                            obselete page count check,  */
+/*                                            resulting in version 6.1.8  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _lx_nand_flash_block_reclaim(LX_NAND_FLASH *nand_flash)
@@ -131,7 +134,7 @@ UINT                    status;
     }
 
     /* Determine if this block is completely obsolete.  */
-    if (obsolete_pages == nand_flash -> lx_nand_flash_pages_per_block)
+    if (obsolete_pages == nand_flash -> lx_nand_flash_pages_per_block - 1)
     {
 
         /* Read page 0 of the block, which has the erase count in the first 4 bytes. */