More lockstep fixing