DDF-589 fixed a race condition that happened on some machines