SCALARIZR-1457 fix