Bug Fix for sending attachments