* Fixed concurrency problem