Fix to CORS support