Fixed issue #2639
Fixed concurrency problem during server startup