diff --git a/docs/src/api/class-websocket.md b/docs/src/api/class-websocket.md
index c3f184a1b7..d1aa1a0322 100644
--- a/docs/src/api/class-websocket.md
+++ b/docs/src/api/class-websocket.md
@@ -13,12 +13,20 @@ Fired when the websocket closes.
 
 Fired when the websocket recieves a frame.
 
+## event: WebSocket.frameReceived
+* langs: csharp, java
+- type: <[WebSocketFrame]>
+
 ## event: WebSocket.frameSent
 - type: <[Object]>
   - `payload` <[string]|[Buffer]> frame payload
 
 Fired when the websocket sends a frame.
 
+## event: WebSocket.frameSent
+* langs: csharp, java
+- type: <[WebSocketFrame]>
+
 ## event: WebSocket.socketError
 - type: <[String]>
 
diff --git a/utils/doclint/api_parser.js b/utils/doclint/api_parser.js
index b2195360cf..00d4556dbe 100644
--- a/utils/doclint/api_parser.js
+++ b/utils/doclint/api_parser.js
@@ -103,7 +103,7 @@ class ApiParser {
         member.async = true;
     }
     const clazz = this.classes.get(match[2]);
-    const existingMember = clazz.membersArray.find(m => m.name === name && m.kind === "method");
+    const existingMember = clazz.membersArray.find(m => m.name === name && m.kind === member.kind);
     if (existingMember) {
       for (const lang of member.langs.only) {
         existingMember.langs.types = existingMember.langs.types || {};