diff --git a/kvdo.spec b/kvdo.spec
index a8743ea0..13bdd14e 100644
--- a/kvdo.spec
+++ b/kvdo.spec
@@ -1,6 +1,6 @@
 %define spec_release 1
 %define kmod_name		kvdo
-%define kmod_driver_version	8.2.1.3
+%define kmod_driver_version	8.2.1.6
 %define kmod_rpm_release	%{spec_release}
 %define kmod_kernel_version	3.10.0-693.el7
 
@@ -94,5 +94,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_usr}/src/%{kmod_name}-%{version}
 
 %changelog
-* Thu Dec 08 2022 - Red Hat VDO Team <vdo-devel@redhat.com> - 8.2.1.3-1
+* Wed Feb 08 2023 - Red Hat VDO Team <vdo-devel@redhat.com> - 8.2.1.6-1
 - See https://github.com/dm-vdo/kvdo.git
diff --git a/vdo/Makefile b/vdo/Makefile
index 7a10b37e..1b8742cd 100644
--- a/vdo/Makefile
+++ b/vdo/Makefile
@@ -1,4 +1,4 @@
-VDO_VERSION = 8.2.1.3
+VDO_VERSION = 8.2.1.6
 
 SOURCES  = $(notdir $(wildcard $(src)/*.c))
 OBJECTS = $(SOURCES:%.c=%.o)
diff --git a/vdo/reference-count-rebuild.c b/vdo/reference-count-rebuild.c
index 70cdff89..5470f5a8 100644
--- a/vdo/reference-count-rebuild.c
+++ b/vdo/reference-count-rebuild.c
@@ -411,12 +411,15 @@ static void rebuild_from_leaves(struct vdo_completion *completion)
 	 * The PBN calculation doesn't work until the tree pages have been
 	 * loaded, so we can't set this value at the start of rebuild.
 	 */
-	rebuild->last_slot = (struct block_map_slot){
+	rebuild->last_slot = (struct block_map_slot) {
 		.slot = rebuild->block_map->entry_count
 			% VDO_BLOCK_MAP_ENTRIES_PER_PAGE,
 		.pbn = vdo_find_block_map_page_pbn(rebuild->block_map,
 						   rebuild->leaf_pages - 1),
 	};
+	if (rebuild->last_slot.slot == 0) {
+		rebuild->last_slot.slot = VDO_BLOCK_MAP_ENTRIES_PER_PAGE;
+	}
 
 	/*
 	 * Prevent any page from being processed until all pages have been