Bug fixed in Attachment_patch