Adding fix for defect related to Attachments parsing