non-deterministic issue fix