diff --git a/src/buildblock/Scanner.cxx b/src/buildblock/Scanner.cxx
index 27bfb495d5..001c00ee8e 100644
--- a/src/buildblock/Scanner.cxx
+++ b/src/buildblock/Scanner.cxx
@@ -1754,13 +1754,12 @@ Scanner::check_consistency() const
     { //! Check consistency of axial and transaxial spacing for block geometry
       if (get_num_axial_buckets() != 1)
         {
-          warning(boost::format("BlocksOnCylindrical num_axial_buckets (%d) is greater than 1. This is not supported yet."
+          warning(boost::format("BlocksOnCylindrical num_axial_buckets (%d) is greater than 1. This is not supported yet. "
                                 "Consider multiplying the number of axial_blocks_per_bucket by %d.")
                   % get_num_axial_buckets() % get_num_axial_buckets());
           return Succeeded::no;
         }
-      { // Ensure the number of axial crystals per bucket is a multiple of the number of rings
-        // This asserts the number of axial
+      { // Assert that each block contains an equal number of axial crystals
         if (get_num_rings() % get_num_axial_crystals_per_bucket() != 0)
           {
             error(boost::format("Error in GeometryBlocksOnCylindrical: number of rings (%d) is not a multiple of the "
diff --git a/src/recon_test/test_blocks_on_cylindrical_projectors.cxx b/src/recon_test/test_blocks_on_cylindrical_projectors.cxx
index c681440695..773a37d971 100644
--- a/src/recon_test/test_blocks_on_cylindrical_projectors.cxx
+++ b/src/recon_test/test_blocks_on_cylindrical_projectors.cxx
@@ -886,7 +886,7 @@ BlocksTests::run_back_projection_test_with_axial_buckets(BackProjectorByBin& bac
     scanner_sptr->set_transaxial_block_spacing(scanner_sptr->get_transaxial_crystal_spacing()
                                                * scanner_sptr->get_num_transaxial_crystals_per_block());
     scanner_sptr->set_num_axial_blocks_per_bucket(2);
-    scanner_sptr->set_num_rings(scanner_sptr->get_num_axial_blocks_per_bucket() * num_buckets);
+    scanner_sptr->set_num_rings(scanner_sptr->get_num_axial_crystals_per_bucket() * num_buckets);
     scanner_sptr->set_scanner_geometry("BlocksOnCylindrical");
     scanner_sptr->set_up();
   }