Fix $this is wrong container