diff --git a/shufflecake-userland/src/commands/close.c b/shufflecake-userland/src/commands/close.c
index e6adde1..4c180f6 100644
--- a/shufflecake-userland/src/commands/close.c
+++ b/shufflecake-userland/src/commands/close.c
@@ -163,7 +163,7 @@ static int _closeVolumes(char **labels, size_t nr_vols)
 
 	/* Eazy peazy */
 	int i;
-	for (i = nr_vols; i >= 0; i--) {
+	for (i = nr_vols-1; i >= 0; i--) {
 		err = sflc_ops_closeVolume(labels[i]);
 		if (err) {
 			sflc_log_error("Could not close volume %s; error %d", labels[i], err);
diff --git a/shufflecake-userland/src/commands/open.c b/shufflecake-userland/src/commands/open.c
index 9046ae6..6c58225 100644
--- a/shufflecake-userland/src/commands/open.c
+++ b/shufflecake-userland/src/commands/open.c
@@ -125,7 +125,7 @@ int sflc_cmd_openVolumes(sflc_cmd_OpenArgs *args)
 	sflc_log_debug("Next device ID is %lu", dev_id);
 
 	/* Open volumes "in order" */
-	for (i = 0; i < dmb_cell.vol_idx; i++) {
+	for (i = 0; i <= dmb_cell.vol_idx; i++) {
 		err = sflc_ops_openVolume(args->bdev_path, dev_id, (size_t) i, &vmbs[i]);
 		if (err) {
 			sflc_log_error("Could not open volume %d; error %d. "