Correctly handle plurals