switched to buffered version. Some tests fail!