[BUG #7794] take plural into account