diff --git a/src/parse.js b/src/parse.js
index 0e538be0b..26d923e3b 100644
--- a/src/parse.js
+++ b/src/parse.js
@@ -587,49 +587,57 @@ function parse(source, root, options) {
     }
 
     function parseOptionValue(parent, name) {
-        if (skip("{", true)) { // { a: "foo" b { c: "bar" } }
-            var result = {};
+        // { a: "foo" b { c: "bar" } }
+        if (skip("{", true)) {
+            var objectResult = {};
+
             while (!skip("}", true)) {
                 /* istanbul ignore if */
-                if (!nameRe.test(token = next()))
+                if (!nameRe.test(token = next())) {
                     throw illegal(token, "name");
+                }
 
                 var value;
                 var propName = token;
+
+                skip(":", true);
+
                 if (peek() === "{")
                     value = parseOptionValue(parent, name + "." + token);
-                else {
-                    skip(":");
-                    if (peek() === "{")
-                        value = parseOptionValue(parent, name + "." + token);
-                    else if (peek() === "[") {
-                        // option (my_option) = {
-                        //     repeated_value: [ "foo", "bar" ]
-                        // };
-                        value = [];
-                        var lastValue;
-                        if (skip("[", true)) {
-                            do {
-                                lastValue = readValue(true);
-                                value.push(lastValue);
-                            } while (skip(",", true));
-                            skip("]");
-                            if (typeof lastValue !== "undefined") {
-                                setOption(parent, name + "." + token, lastValue);
-                            }
+                else if (peek() === "[") {
+                    // option (my_option) = {
+                    //     repeated_value: [ "foo", "bar" ]
+                    // };
+                    value = [];
+                    var lastValue;
+                    if (skip("[", true)) {
+                        do {
+                            lastValue = readValue(true);
+                            value.push(lastValue);
+                        } while (skip(",", true));
+                        skip("]");
+                        if (typeof lastValue !== "undefined") {
+                            setOption(parent, name + "." + token, lastValue);
                         }
-                    } else {
-                        value = readValue(true);
-                        setOption(parent, name + "." + token, value);
                     }
+                } else {
+                    value = readValue(true);
+                    setOption(parent, name + "." + token, value);
                 }
-                var prevValue = result[propName];
+
+                var prevValue = objectResult[propName];
+
                 if (prevValue)
                     value = [].concat(prevValue).concat(value);
-                result[propName] = value;
-                skip(",", true) || skip(";", true);
+
+                objectResult[propName] = value;
+
+                // Semicolons and commas can be optional
+                skip(",", true);
+                skip(";", true);
             }
-            return result;
+
+            return objectResult;
         }
 
         var simpleValue = readValue(true);
diff --git a/tests/comp_options.js b/tests/comp_options.js
new file mode 100644
index 000000000..ec9888482
--- /dev/null
+++ b/tests/comp_options.js
@@ -0,0 +1,54 @@
+var tape = require("tape");
+
+var protobuf = require("..");
+
+var proto = `
+syntax = "proto3";
+
+option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
+    info: {
+      title: "Some info";
+      version: "0";
+    };
+    host: "some.host";
+};
+
+message Message {
+    int32 regular_int32 = 1;
+    optional int32 optional_int32 = 2;
+    oneof _oneof_int32 {
+        int32 oneof_int32 = 3;
+    }
+    actionType action = 4 [ (validate.rules).enum = {
+        defined_only: true,
+        not_in: [ 0 ],
+        in: ["google","github","azuread"]
+    } ];
+}
+`;
+
+tape.test("complex options", function (test) {
+  var root = protobuf.parse(proto).root;
+
+  test.deepEqual(root.parsedOptions[0], {
+    "(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger)": {
+      info: {
+        title: "Some info",
+        version: "0",
+      },
+      host: "some.host",
+    },
+  });
+
+  test.deepEqual(root.Message.fields.action.parsedOptions[0], {
+    "(validate.rules)": {
+      enum: {
+        defined_only: true,
+        not_in: [0],
+        in: ["google", "github", "azuread"],
+      },
+    },
+  });
+
+  test.end();
+});