CloudFront workaround