Fix domain overriding