Fixed the pluralization issue