Fix export template #607

Fix #607