Bug fix: $this context