Fixed issue with file attachments