Fix client simulation bug