Fixed issue with template retrieval