-Fixing warning of Sonar