JIRA issue no 39