Fix singular/plural confusion