Replace with CROSS_DOMAIN indicator 
See line 45