Plurals and Singulars OH MY!

Fixes #1039