Fixed issue with template implemenatation