Borken attempt to fix domain access fields.