fixed same domain issues