Remove rarity and fix the bug