Avoids bad checks

Buffering is good, this should resolve #229. Buffer should have been
fine.