Another try to fix race condition in the upstreams.