Fixed jira issue