buffer bug fixed?