Bug fix of tag checking