Fix simulation to support diff pairs