Fixed discover template #22