JIRA-1706 fix
Merge pull request #14 from BoykoAlex/jira1706

JIRA-1706 fix