Bug fix of jira issue.