Fixing race condition for forge clients.