sonarfixes < 40