3 Commit (Fixing-CORS-crash)