Buffering bug fixed