fixed race condition

Removed a stupid race condition from pass two.  An intermittent bug
associated with it seems to be gone, but this needs more testing anyway.