Handle recursive sync properly