Fix for one of Sonar voilations changes
Fix for sonar resolutions