Fix ovewriting templates