Increased buffer size [#34]