Fix plural bug