Fix MultiDomain compatibility