fix sonar advise