Some buffering's bug fixed