Fixing bug with match tagger