Fixed pluralization issue