Fix broken tag generation