[BUG #8143] switch to singular