SUPPORT-137: We also need to set the buffer size