Fix recursive field creation