add a sync to avoid race condition on staging