fix sonar complains