Fixed a non-determinism issue. Probably found a bug.