solves jira-2396