SCALARIZR-1409 *Fix attributes