Yet another sonar fix