Fixing from a borken merge.
Hunting out non-determinism