Fix class into TagRemove_FR
Merge remote-tracking branch 'frodrigo/master'