*FINALLY* Fix a really nasty nondeterministic bug that has been haunting us