fixing cross domain message issue