in sonar fix for #1442 issue