Sonar workaround