fix: Using $this when not in object context
Merge branch 'hotfix/0.2.6'