Make iteration numbers consistent with server (fixes #31)