Fix can't totally untag issue