CORS support fixed