Fix broken templates attachments due to commit 814b087,