Fix issue #448 - Template selection is broken.