Cross-site fix