Attempt to fix CORS support