Avoid pluralization issue