fix #13 part 2
Merge branch 'hotfix/fix.13'