Trying to fix CORS bug