Fixed buffering issue.