SC#QCADOOMESCLS-920 some fix