fix ticket 2586
Merge pull request #237 from igal-getrailo/jira-2586

Jira 2586