Bugfix: $this removed