Adding a fix for CORS