fix ticket 2361
Merge pull request #222 from igal-getrailo/jira-2361c

Jira 2361c