Fix to issue 5, not correctly offsetting into circular buffers.