Fix for avoid cross domain problems