Fixed race condition with very fast local server