Fix for cross-domain