diff --git a/src/pulse/stream.c b/src/pulse/stream.c
index 3585b27e8..0cceb14e0 100644
--- a/src/pulse/stream.c
+++ b/src/pulse/stream.c
@@ -1917,7 +1917,10 @@ static void stream_get_timing_info_callback(pa_pdispatch *pd, uint32_t command,
              * total correction.*/
             for (n = 0, j = o->stream->current_write_index_correction+1;
                  n < PA_MAX_WRITE_INDEX_CORRECTIONS;
-                 n++, j = (j + 1) % PA_MAX_WRITE_INDEX_CORRECTIONS) {
+                 n++, j++) {
+
+                /* First fix up the index to be within the array */
+                j  = j % PA_MAX_WRITE_INDEX_CORRECTIONS;
 
                 /* Step over invalid data or out-of-date data */
                 if (!o->stream->write_index_corrections[j].valid ||