Fixed: use $this instead of self keyword on non static functions