Fix Value buffer