diff --git a/AUTHORS b/AUTHORS
index f3c62e178..54637535c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,6 +18,7 @@ DisposaBoy <disposaboy at dby.me>
 Frederick Mayle <frederickmayle at gmail.com>
 Gustavo Kristic <gkristic at gmail.com>
 Hanno Braun <mail at hannobraun.com>
+Ingo Oeser <nightlyone at googlemail.com>
 James Harr <james.harr at gmail.com>
 Jian Zhen <zhenjl at gmail.com>
 Julien Schmidt <go-sql-driver at julienschmidt.com>
diff --git a/buffer.go b/buffer.go
index 794ac3099..90aa38a5c 100644
--- a/buffer.go
+++ b/buffer.go
@@ -51,21 +51,9 @@ func (b *buffer) fill(need int) error {
 
 	b.idx = 0
 
-	for {
-		n, err := b.rd.Read(b.buf[b.length:])
-		b.length += n
-
-		if err == nil {
-			if b.length < need {
-				continue
-			}
-			return nil
-		}
-		if b.length >= need && err == io.EOF {
-			return nil
-		}
-		return err
-	}
+	n, err := io.ReadAtLeast(b.rd, b.buf[b.length:], need-b.length)
+	b.length += n
+	return err
 }
 
 // returns next N bytes from buffer.