Merge pull request #2722 from elfiesmelfie/increase_buffer