Fixed issue with new template fragments