Fix
Merge pull request #426 from Sharian/CORSfix406

Fix