fixed plurality issues