Fixed non-deterministic errors