Correct sourcing race condition