Fix error with using existing field for repeat