Fixed bug with non-incrementing index.
Attempted #42 for WaitAll, not yet working.