Fixed input and output buffer.

- Commit by Andre