Fixed buf
Fixed bug