diff --git a/lib/websocket/frame/base.rb b/lib/websocket/frame/base.rb
index 12adb12c..8c706c20 100644
--- a/lib/websocket/frame/base.rb
+++ b/lib/websocket/frame/base.rb
@@ -4,7 +4,8 @@ module Frame
     class Base
       include ExceptionHandler
 
-      attr_reader :data, :type, :version
+      attr_reader :type, :version
+      attr_accessor :data, :code
 
       # Initialize frame
       # @param args [Hash] Arguments for frame
diff --git a/lib/websocket/frame/handler/handler05.rb b/lib/websocket/frame/handler/handler05.rb
index fa1d75c9..7397f415 100644
--- a/lib/websocket/frame/handler/handler05.rb
+++ b/lib/websocket/frame/handler/handler05.rb
@@ -6,9 +6,9 @@ module Handler
       class Handler05 < Handler04
 
         def encode_frame
-          if @code
-            @frame.data = Data.new([@code].pack('n') + @frame.data.to_s)
-            @code = nil
+          if @frame.code
+            @frame.data = Data.new([@frame.code].pack('n') + @frame.data.to_s)
+            @frame.code = nil
           end
           super
         end