Fixed Sonar Blocking issues