Fixing $this issue