Fixed wrong method error
Merge branch 'hotfix/0.5.5'