Fixing sonar bug.