New attack on #88. Added buffering.