Will remove domain == null condition