Oops, properly handling buffers.