Bugfix

Should fix: "Using $this when not in object context"