diff --git a/websocket-sharp/MessageEventArgs.cs b/websocket-sharp/MessageEventArgs.cs
index 3c399a53..6ac32678 100644
--- a/websocket-sharp/MessageEventArgs.cs
+++ b/websocket-sharp/MessageEventArgs.cs
@@ -162,5 +162,23 @@ namespace WebSocketSharp
     }
 
     #endregion
+
+    #region Private Methods
+
+    private void setData ()
+    {
+      if (_dataSet)
+        return;
+
+      if (_opcode == Opcode.Binary) {
+        _dataSet = true;
+        return;
+      }
+
+      _data = _rawData.UTF8Decode ();
+      _dataSet = true;
+    }
+
+    #endregion
   }
 }