DF#QCADOOMES-2157 fix in js