Fix of domain matching