LAC-62: satisfy Sonar demands