Fixed bug related to buffer