One more stab at concurrency issues to fix issue #2.