SONARJAVA-193 Fix according to feedback