ISSUE #19:  Fixed concurrency.