diff --git a/commands/backup.go b/commands/backup.go
index 3ee7abe..db6e51a 100644
--- a/commands/backup.go
+++ b/commands/backup.go
@@ -223,7 +223,8 @@
 	// STEP 4: Wait for completion
 
 	flags := GM_UNTIL_ENACTED | GM_UNTIL_FOUND | GM_UNTIL_STATUS | Ternary_uint32(options.Quiet, GM_QUIET, 0)
-	conn, completed_backupop, err := FindModelWithRetry(conn, descriptor, "BackupOperation", "uuid", backupop["uuid"].(string), flags)
+	queries := map[string]string{"uuid": backupop["uuid"].(string)}
+	conn, completed_backupop, err := FindModelWithRetry(conn, descriptor, "BackupOperation", queries, flags)
 	if err != nil {
 		return err
 	}