SONARJAVA-385 Fix the implementation