- Fix left-over $this instance