JIRA-475 fixed