Fix ticket#246
Merge branch 'hotfix/ticket#246'