Fixed issue with templater