Added more buffer plus fixed a little problem.