Fix problems on subdomains