Fixed issue with AmazonCloudFront annotations