jira SKAD-2332 bug fixed