Bigger buffer size to solve buffer overflow, (part of issue EN-159)