fixed regression caused by previous fix of JIRA-2550
Merge pull request #233 from igal-getrailo/jira-2550c

Jira 2550c