Fix tag format