Fixed a buffering issue