Another cross-domain fix