Fixed race condition with reinitialization of bufio reader.  Tests pass.