Another attempt at fix for CORS