Fix issue #469 - Templates were not scanned correctly.