Fix pluralization issue