Fix for file attachments