Fix $this check