trying to fix annoying cross domain issues