BugFix (sonar bugs)