JIRA-1970 small fix