Fix tag wrapping issue