Fix tag removal