Fix regression around buffer changing