Fixed bug with removing tag name suffix.