Fix tag class