diff --git a/lib/xcore.js b/lib/xcore.js
index f5c7ade..bcd4d5d 100644
--- a/lib/xcore.js
+++ b/lib/xcore.js
@@ -299,13 +299,14 @@ XClient.prototype.unpackEvent = function(type, seq, extra, code, raw)
     } else if (type == 16) { // CreateNotify
         var values = raw.unpack('LLssSSSc');
         event.name = 'CreateNotify'
-        event.parent = extra;
-        event.wid = values[0];
+        event.parent = values[0];
+        event.wid = values[1];
         event.x = values[2];
         event.y = values[3];
         event.width = values[4];
         event.height = values[5];
-        event.overrideRedirect = values[6] ? true : false;
+        event.borderWidth = values[6];
+        event.overrideRedirect = values[7] ? true : false;
         // x, y, width, height, border
     } else if (type == 17) { // destroy notify
         var values = raw.unpack('LL');