fix
Merge branch 'hotfix/fix-for-method-resolution'