Resolved Sonar Violation in ...