diff --git a/src/maze/mz_square_cells.scad b/src/maze/mz_square_cells.scad
index 09407d72..a4f04290 100644
--- a/src/maze/mz_square_cells.scad
+++ b/src/maze/mz_square_cells.scad
@@ -15,16 +15,14 @@ function mz_square_cells(rows, columns, start = [0, 0], init_cells, x_wrapping =
     let(
         init_undef = is_undef(init_cells),
         mz = init_undef ? mz_square_initialize(rows, columns) : init_cells,
-        rc = init_undef ? 
-                 [rows, columns] : 
-                 let(r = len([for(cell = mz) if(cell.y == 0) undef]))
-                 [r, len(mz) - r]
+        r = len([for(cell = mz) if(cell.x == 0) undef]),
+        c = len([for(cell = mz) if(cell.y == 0) undef])
     )
     go_maze( 
         start.x, 
         start.y,   
         mz,  
-        rc[0], rc[1], 
+        r, c, 
         x_wrapping, 
         y_wrapping, 
         seed