Fixed problem with buffer being sent back