diff --git a/opaque.c b/opaque.c
index f03b70a..f54a032 100644
--- a/opaque.c
+++ b/opaque.c
@@ -63,10 +63,12 @@
 			 __func__);
 		return ERROR_FLASHPROG_BUG;
 	}
-	rmst.max_rom_decode = MAX_ROM_DECODE_UNLIMITED;
 	rmst.buses_supported = BUS_PROG;
 	rmst.opaque = *mst;
 	if (data)
 		rmst.opaque.data = data;
+
+	rmst.common.max_rom_decode = MAX_ROM_DECODE_UNLIMITED;
+
 	return register_master(&rmst);
 }