Fix lag in diverging clocks (bug #1696)