Fix buffer start handling