Fixed sonar blocker issue