Resolved mor sonar issues