A try to fix SCALARIZR-627