1. increase buffer size
merge conflict 1.4.1