Fix tag overflow