Fix race condition for content load