solved ticket 3218
Merge pull request #437 from getrailo/jira-3218

solved ticket 3218