Fix pluralization bug