From Sergey: Fix for CORS requests