Fixed "Using $this when not in object context"