Some buffering bug fixed