[2.2] Fixes race for slave catching up to master