Try a fix for sonar