#405 Fixed use of $this