Try to fix non-deterministic test again...