diff --git a/Source/SocketPacket.swift b/Source/SocketPacket.swift
index c9199c8..3373503 100644
--- a/Source/SocketPacket.swift
+++ b/Source/SocketPacket.swift
@@ -78,10 +78,10 @@ struct SocketPacket {
         }
         
         binary.append(data)
-        currentPlace++
+        currentPlace += 1
         
         if placeholders == currentPlace {
-            currentPlace = 0
+            fillInPlaceholders()
             return true
         } else {
             return false
@@ -192,15 +192,8 @@ struct SocketPacket {
         return str
     }
     
-    mutating func fillInPlaceholders() {
-        for i in 0..<data.count {
-            if let str = data[i] as? String, num = str["~~(\\d)"].groups() {
-                // Fill in binary placeholder with data
-                data[i] = binary[Int(num[1])!]
-            } else if data[i] is NSDictionary || data[i] is NSArray {
-                data[i] = _fillInPlaceholders(data[i])
-            }
-        }
+    private mutating func fillInPlaceholders() {
+        data = data.map({_fillInPlaceholders($0)})
     }
     
     private mutating func _fillInPlaceholders(data: AnyObject) -> AnyObject {
diff --git a/Source/SocketParser.swift b/Source/SocketParser.swift
index ca067b2..872a5e8 100644
--- a/Source/SocketParser.swift
+++ b/Source/SocketParser.swift
@@ -166,8 +166,7 @@ class SocketParser {
             return
         }
         
-        var packet = socket.waitingData.removeLast()
-        packet.fillInPlaceholders()
+        let packet = socket.waitingData.removeLast()
         
         if packet.type != .BinaryAck {
             socket.handleEvent(packet.event, data: packet.args ?? [],