DF#QCADOOMESCLS-910 fix number generator