solves jira-1377