diff --git a/websocket-sharp/WebSocketFrame.cs b/websocket-sharp/WebSocketFrame.cs
index dc440a2a..38865b97 100644
--- a/websocket-sharp/WebSocketFrame.cs
+++ b/websocket-sharp/WebSocketFrame.cs
@@ -198,13 +198,13 @@ namespace WebSocketSharp
 
     public bool IsControl {
       get {
-        return _opcode == Opcode.Close || _opcode == Opcode.Ping || _opcode == Opcode.Pong;
+        return _opcode >= Opcode.Close;
       }
     }
 
     public bool IsData {
       get {
-        return _opcode == Opcode.Binary || _opcode == Opcode.Text;
+        return _opcode == Opcode.Text || _opcode == Opcode.Binary;
       }
     }