Fixing Sonar bug.