Fixed: Templates issues