Used buffer this time
Fixed a bug