Fix mixup of templates