Fix for the Attachment