Fixed wrong func
Merge branch 'hotfix/Issue#1'