Fix to problem w/ template selection.