#110 cope with domain variations