diff --git a/tcp-connection.go b/tcp-connection.go
index 8875a18..af91b0b 100644
--- a/tcp-connection.go
+++ b/tcp-connection.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bufio"
 	"encoding/binary"
 	"fmt"
 	"log"
@@ -111,15 +112,15 @@ func (c *Connection) Call(msg FrameType, data []byte) (*FrameWithPayload, error)
 func WaitForFrame(conn net.Conn, resultChan chan<- FrameWithPayload) error {
 	var err error
 	var frame Frame
-	//r := bufio.NewReader(conn)
+	r := bufio.NewReader(conn)
 
-	err = binary.Read(conn, binary.LittleEndian, &frame)
+	err = binary.Read(r, binary.LittleEndian, &frame)
 	if err != nil {
 		return err
 	}
 	if frame.IsValid() {
 		payload := make([]byte, frame.Length)
-		_, err = conn.Read(payload)
+		_, err = r.Read(payload)
 		if err != nil {
 			return err
 		}