Fix for Sonar