Make sure to always end a buffer