Fix collector template