Fix buffer clash (one already present, one added in 3.16.0-254-gb9c4e27),