Work around for the non-unique domain bug #41