Fix tag cutoff bug