solved jira-2392