diff --git a/lib/apns/core.rb b/lib/apns/core.rb
index 4ae9109..5ad65d0 100644
--- a/lib/apns/core.rb
+++ b/lib/apns/core.rb
@@ -112,7 +112,7 @@ def self.parse_feedback_tuple(data)
   def self.packaged_notification(device_token, message)
     pt = self.packaged_token(device_token)
     pm = self.packaged_message(message)
-    [0, 0, 32, pt, 0, pm.size, pm].pack("ccca*cca*")
+    [0, 0, 32, pt, 0, pm.bytesize, pm].pack("ccca*cca*")
   end
   
   def self.packaged_token(device_token)
@@ -121,7 +121,7 @@ def self.packaged_token(device_token)
   
   def self.packaged_message(message)
     if message.is_a?(Hash)
-      message.to_json
+      {:aps => message}.to_json
     elsif message.is_a?(String)
       '{"aps":{"alert":"'+ message + '"}}'
     else