solves jira-2396
Merge pull request #165 from igal-getrailo/jira-2396

solves jira-2396