Fix fields in domains.
Fix fields in domains. part2