Fixed here and in OkBuffer.