solves jira-1377
Merge pull request #164 from igal-getrailo/jira-1377

solves jira-1377