Testing buf fix ...