1 files changed, 9 insertions, 7 deletions
diff --git a/marshal.go b/marshal.go
index 346115b..d7166fa 100644
--- a/marshal.go
+++ b/marshal.go
@@ -28,13 +28,15 @@ func marshal(names map[string]string) {
 	fmt.Fprintln(w, ")")
 	fmt.Fprintln(w, "")
 
-	if len(argv.Marshal) == 0 {
-		marshalThing(w, names["Base"])
-		marshalThing(w, names["Bases"])
-	} else {
-		for _, v := range argv.Marshal {
-			marshalThing(w, v)
-		}
+	for _, v := range marshalKeys {
+		log.Info("found marshal key in .proto", v)
+		marshalThing(w, v)
+	}
+
+	//	marshalThing(w, names["Base"])
+	//	marshalThing(w, names["Bases"])
+	for _, v := range argv.Marshal {
+		marshalThing(w, v)
 	}
 }