bug fix: same origin policy issue