TODO: do this only if sync on creation was checked?