Fix zero-indexing on the client driver side