Fixed broken elements generated via template #85.