Fixing issue with attachment name/description