bugfix on sonar