Done bug fix of jira issue.